diff options
| author | Joost Peters | 2003-07-21 01:11:20 +0000 |
|---|---|---|
| committer | Joost Peters | 2003-07-21 01:11:20 +0000 |
| commit | 2929a90d17a81b285f8041f24993023ab3cc35e6 (patch) | |
| tree | c889b6e34e86a02797b5a8873cb3eae81baabeb4 /backends | |
| parent | a7391d0a9aa58e92cfe6eed80911bec9486d519b (diff) | |
| download | scummvm-rg350-2929a90d17a81b285f8041f24993023ab3cc35e6.tar.gz scummvm-rg350-2929a90d17a81b285f8041f24993023ab3cc35e6.tar.bz2 scummvm-rg350-2929a90d17a81b285f8041f24993023ab3cc35e6.zip | |
update, fix compilation
svn-id: r9104
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/gp32/gp32.cpp | 12 | ||||
| -rw-r--r-- | backends/gp32/gp32.h | 7 | ||||
| -rw-r--r-- | backends/gp32/sdl.h | 3 |
3 files changed, 16 insertions, 6 deletions
diff --git a/backends/gp32/gp32.cpp b/backends/gp32/gp32.cpp index e9c653a968..d0427f2846 100644 --- a/backends/gp32/gp32.cpp +++ b/backends/gp32/gp32.cpp @@ -766,8 +766,7 @@ void OSystem_GP32::update_screen() { dst_y *= _scaleFactor; - _scaler_proc((byte*)sdl_tmpscreen->pixels + (r->x*2+2) + (r->y+1)*srcPitch, srcPitch, NULL, - (byte*)sdl_hwscreen->pixels + r->x*2*_scaleFactor + dst_y*dstPitch, dstPitch, r->w, dst_h); + _scaler_proc((byte*)sdl_tmpscreen->pixels + (r->x*2+2) + (r->y+1)*srcPitch, srcPitch, (byte*)sdl_hwscreen->pixels + r->x*2*_scaleFactor + dst_y*dstPitch, dstPitch, r->w, dst_h); } r->x *= _scaleFactor; r->y = dst_y; @@ -984,6 +983,11 @@ bool OSystem_GP32::set_sound_proc(SoundProc *proc, void *param, SoundFormat form return false; } +void OSystem_GP32::clear_sound_proc() { + //_sound_proc = NULL; + //_sound_proc_param = NULL; +} + void OSystem_GP32::get_screen_image(byte *buf) { /* make sure the mouse is gone */ undraw_mouse(); @@ -1075,7 +1079,9 @@ void OSystem_GP32::update_cdrom() { } void OSystem_GP32::set_timer(int timer, int (*callback)(int)) { } // Mutex handling -MutexRef OSystem_GP32::create_mutex() { } +OSystem::MutexRef OSystem_GP32::create_mutex() { + return NULL; +} void OSystem_GP32::lock_mutex(MutexRef mutex) { } void OSystem_GP32::unlock_mutex(MutexRef mutex) { } void OSystem_GP32::delete_mutex(MutexRef mutex) { } diff --git a/backends/gp32/gp32.h b/backends/gp32/gp32.h index 19d0f9ebd6..764ed4e18f 100644 --- a/backends/gp32/gp32.h +++ b/backends/gp32/gp32.h @@ -39,7 +39,9 @@ public: // Set the size of the video bitmap. // Typically, 320x200 void init_size(uint w, uint h); - + int16 get_height() { return _screenHeight; } + int16 get_width() { return _screenWidth; } + // Draw a bitmap to screen. // The screen will not be updated to reflect the new bitmap void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h); @@ -81,6 +83,7 @@ public: // Format is the sample type format. // Only 16-bit signed mode is needed for simon & scumm bool set_sound_proc(SoundProc *proc, void *param, SoundFormat format); + void clear_sound_proc(); // Get or set a property uint32 property(int param, Property *value); @@ -102,7 +105,7 @@ public: void set_timer(int timer, int (*callback)(int)); // Mutex handling - MutexRef create_mutex(); + OSystem::MutexRef create_mutex(); void lock_mutex(MutexRef mutex); void unlock_mutex(MutexRef mutex); void delete_mutex(MutexRef mutex); diff --git a/backends/gp32/sdl.h b/backends/gp32/sdl.h index 0ef46966ce..be0c162225 100644 --- a/backends/gp32/sdl.h +++ b/backends/gp32/sdl.h @@ -81,4 +81,5 @@ typedef struct SDL_Surface { #define SDL_SWSURFACE 0x00000000 #define SDL_HWSURFACE 0x00000001 -#define SDL_FULLSCREEN 0x80000000
\ No newline at end of file +#define SDL_FULLSCREEN 0x80000000 + |