diff options
Diffstat (limited to 'backends/morphos')
| -rw-r--r-- | backends/morphos/morphos.cpp | 8 | ||||
| -rw-r--r-- | backends/morphos/morphos.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/backends/morphos/morphos.cpp b/backends/morphos/morphos.cpp index 2482d5e274..d36965538d 100644 --- a/backends/morphos/morphos.cpp +++ b/backends/morphos/morphos.cpp @@ -1436,13 +1436,13 @@ void OSystem_MorphOS::set_mouse_cursor(const byte *buf, uint w, uint h, int hots UndrawMouse(); } -bool OSystem_MorphOS::set_sound_proc(OSystem::SoundProc proc, void *param, OSystem::SoundFormat format) +bool OSystem_MorphOS::setSoundCallback(OSystem::SoundProc proc, void *param) { if (ScummSoundThread) { if (SoundProc == proc) return true; - clear_sound_proc(); + clearSoundCallback(); } SoundProc = proc; @@ -1479,7 +1479,7 @@ void OSystem_MorphOS::fill_sound(byte *stream, int len) memset(stream, 0x0, len); } -void OSystem_MorphOS::clear_sound_proc() +void OSystem_MorphOS::clearSoundCallback() { if (ScummSoundThread) { @@ -1490,7 +1490,7 @@ void OSystem_MorphOS::clear_sound_proc() } } -void OSystem_MorphOS::init_size(uint w, uint h) +void OSystem_MorphOS::initSize(uint w, uint h) { if (ScummBuffer) { diff --git a/backends/morphos/morphos.h b/backends/morphos/morphos.h index deea09bbf7..49ea1a654a 100644 --- a/backends/morphos/morphos.h +++ b/backends/morphos/morphos.h @@ -47,7 +47,7 @@ class OSystem_MorphOS : public OSystem // Set the size of the video bitmap. // Typically, 320x200 - virtual void init_size(uint w, uint h); + virtual void initSize(uint w, uint h); // Draw a bitmap to screen. // The screen will not be updated to reflect the new bitmap @@ -101,9 +101,9 @@ class OSystem_MorphOS : public OSystem virtual void warp_mouse(int x, int y); // Set the function to be invoked whenever samples need to be generated - virtual bool set_sound_proc(SoundProc proc, void *param, SoundFormat format); + virtual bool setSoundCallback(SoundProc proc, void *param); void fill_sound (byte * stream, int len); - void clear_sound_proc(); + void clearSoundCallback(); virtual uint32 property(int param, Property *value); |