# HG changeset patch # User Jani Hyvonen # Date 1285163477 -10800 # Node ID 52ce3e8fba90aa30a4de2a16f6a4c083017a1760 # Parent ae83407e7b6a492228e076119c6fe68c6dc8141f Header and class name changes diff -r ae83407e7b6a -r 52ce3e8fba90 symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.cpp --- 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 -#include //Registers and enums +#include //Registers and enums #include //mutex -#include -#include "syborg-graphicswrapper.h" +#include +#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 ); } diff -r ae83407e7b6a -r 52ce3e8fba90 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.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: };