diff options
author | Max Horn | 2004-02-24 22:39:42 +0000 |
---|---|---|
committer | Max Horn | 2004-02-24 22:39:42 +0000 |
commit | d158280425efac5f4ec72e00fb2b7389cdfb5a75 (patch) | |
tree | f1bdab69e381b2a28320fdeb30936482565e5099 /backends/PalmOS | |
parent | 70f910cbe19e9c7320a56fa48669f7a5e9df00e6 (diff) | |
download | scummvm-rg350-d158280425efac5f4ec72e00fb2b7389cdfb5a75.tar.gz scummvm-rg350-d158280425efac5f4ec72e00fb2b7389cdfb5a75.tar.bz2 scummvm-rg350-d158280425efac5f4ec72e00fb2b7389cdfb5a75.zip |
the OSystem changes we discussed on the ML (note: renaming of the existing OSystem API is not yet finished); porters will have to fix their ports to get them to compile again
svn-id: r13036
Diffstat (limited to 'backends/PalmOS')
-rw-r--r-- | backends/PalmOS/Src/palm.cpp | 7 | ||||
-rw-r--r-- | backends/PalmOS/Src/palm.h | 11 |
2 files changed, 8 insertions, 10 deletions
diff --git a/backends/PalmOS/Src/palm.cpp b/backends/PalmOS/Src/palm.cpp index 98f15d7944..05ebe67520 100644 --- a/backends/PalmOS/Src/palm.cpp +++ b/backends/PalmOS/Src/palm.cpp @@ -230,7 +230,7 @@ void OSystem_PALMOS::unload_gfx_mode() { } -void OSystem_PALMOS::init_size(uint w, uint h) { +void OSystem_PALMOS::initSize(uint w, uint h) { _screenWidth = w; _screenHeight = h; _offScreenPitch = gVars->screenPitch; // direct screen / flipping use this, reset later if buffered @@ -1593,13 +1593,12 @@ static Err sndCallback(void* UserDataP, SndStreamRef stream, void* bufferP, UInt return errNone; } -bool OSystem_PALMOS::set_sound_proc(SoundProc proc, void *param, SoundFormat format) { +bool OSystem_PALMOS::setSoundCallback(SoundProc proc, void *param) { Boolean success = false; if (!_sound.active) { _sound.proc = proc; _sound.param = param; - _sound.format = format; _sound.active = true; // always true when we call this function // try to create sound stream @@ -1622,7 +1621,7 @@ bool OSystem_PALMOS::set_sound_proc(SoundProc proc, void *param, SoundFormat for return success; } -void OSystem_PALMOS::clear_sound_proc() { +void OSystem_PALMOS::clearSoundCallback() { if (_sound.active) { if (!_sound.useHandler) { SndStreamStop(_sound.sndRefNum); diff --git a/backends/PalmOS/Src/palm.h b/backends/PalmOS/Src/palm.h index c1dbc29140..cd87daf12c 100644 --- a/backends/PalmOS/Src/palm.h +++ b/backends/PalmOS/Src/palm.h @@ -37,7 +37,6 @@ Err HwrDisplayPalette(UInt8 operation, Int16 startIndex, typedef struct { OSystem::SoundProc proc; void *param; - OSystem::SoundFormat format; SndStreamRef sndRefNum; bool active, useHandler; @@ -51,7 +50,7 @@ public: // Set the size of the video bitmap. // Typically, 320x200 - void init_size(uint w, uint h); + void initSize(uint w, uint h); // Draw a bitmap to screen. // The screen will not be updated to reflect the new bitmap @@ -103,14 +102,14 @@ public: * @param param an arbitrary parameter which is stored and passed to proc. * @param format the sample type format. */ - bool set_sound_proc(SoundProc proc, void *param, SoundFormat format); + bool setSoundCallback(SoundProc proc, void *param); /** - * Remove any audio callback previously set via set_sound_proc, thus effectively + * Remove any audio callback previously set via setSoundCallback, thus effectively * stopping all audio output immediately. - * @see set_sound_proc + * @see setSoundCallback */ - void clear_sound_proc(); + void clearSoundCallback(); //@} // Poll cdrom status |