Header and class name changes graphics-phase-3
authorJani Hyvonen<jani.hyvonen@nokia.com>
Wed, 22 Sep 2010 16:51:17 +0300
branchgraphics-phase-3
changeset 110 52ce3e8fba90
parent 109 ae83407e7b6a
child 111 345f1c88c950
Header and class name changes
symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.cpp
symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.h
--- a/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.cpp	Tue Sep 14 17:21:05 2010 +0100
+++ b/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.cpp	Wed Sep 22 16:51:17 2010 +0300
@@ -2,13 +2,13 @@
 
 #include "platformtypes.h"
 #include <KhronosAPIWrapper.h>
-#include <VirtualVideoInterfaceConstants.h>  //Registers and enums 
+#include <guestvideodriverinterfaceconstants.h>  //Registers and enums 
 #include <platformthreading.h>  //mutex
-#include <protocol_MGraphicsVHWCallback.h>
-#include "syborg-graphicswrapper.h"
+#include <graphicsvhwcallback.h>
+#include "syborggraphicswrapper.h"
 
 SyborgGraphicsWrapper::SyborgGraphicsWrapper()
-    {
+    {															
     }
 
 SyborgGraphicsWrapper::~SyborgGraphicsWrapper()
@@ -32,7 +32,7 @@
     uint8_t *frame_buffer = (uint8_t *)aGraphicsMemBase;
     if( (cmd_buffer != NULL) && (frame_buffer != NULL) )
         {
-        m_wrapper = new KhronosAPIWrapper( (protocol_MGraphicsVHWCallback*)this,
+        m_wrapper = new KhronosAPIWrapper( (MGraphicsVHWCallback*)this,
             frame_buffer, &cmd_buffer[VVHW_INPUT_BASE], &cmd_buffer[VVHW_OUTPUT_BASE] );
         //Reset synchronisation mechanisms
         Psu::platform_release_semaphore(m_outputBufferSemaphore);
@@ -55,7 +55,7 @@
 
 void SyborgGraphicsWrapper::ReleaseOutputBuffer(){}
 
-void SyborgGraphicsWrapper::ProsessingDone(int i)
+void SyborgGraphicsWrapper::ProcessingDone(int i)
     {
     m_pythonCallBack( i );
     }
--- a/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.h	Tue Sep 14 17:21:05 2010 +0100
+++ b/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.h	Wed Sep 22 16:51:17 2010 +0300
@@ -2,7 +2,7 @@
 #define _SYBORG_GRAPHICSWRAPPER_H
 
 #pragma once
-
+					  
 #ifdef WIN32
 #ifdef SYBORG_GRAPHICSWRAPPER_EXPORTS
 #define SYBORG_GRAPHICSWRAPPER_API __declspec(dllexport)
@@ -16,7 +16,7 @@
 Psu::PLATFORM_SEMAPHORE_T m_outputBufferSemaphore;
 int (*m_pythonCallBack)(int); 
 KhronosAPIWrapper* m_wrapper;
-
+														   
 
 // Derived from GraphicsVirtualHW.lisa
 static const int VVHW_BUFFER (0x3000000);
@@ -27,7 +27,7 @@
 static const int VVHW_FRAME_BUFFER (0x1000000);
 static const int VVHW_FRAME_BASE(0x2000000);
 
-class SyborgGraphicsWrapper : public protocol_MGraphicsVHWCallback
+class SyborgGraphicsWrapper : public MGraphicsVHWCallback
     {
     public:
 
@@ -38,7 +38,7 @@
 
         virtual void LockOutputBuffer();
 	    virtual void ReleaseOutputBuffer();
-	    virtual void ProsessingDone(int i);
+	    virtual void ProcessingDone(int i);
 
     private:
     };