diff options
author | Ludvig Strigeus | 2002-04-16 12:07:19 +0000 |
---|---|---|
committer | Ludvig Strigeus | 2002-04-16 12:07:19 +0000 |
commit | 71eac5acd30cb1fd48cbfbc464b4a37adee8a6b4 (patch) | |
tree | 8b6e4950c5dd6805344f8051cac517461691d76d /morphos | |
parent | d91b85049fc8d40cd9ac5ac42fef2d4f1008d63e (diff) | |
download | scummvm-rg350-71eac5acd30cb1fd48cbfbc464b4a37adee8a6b4.tar.gz scummvm-rg350-71eac5acd30cb1fd48cbfbc464b4a37adee8a6b4.tar.bz2 scummvm-rg350-71eac5acd30cb1fd48cbfbc464b4a37adee8a6b4.zip |
endian fixes,
don't use adlib driver if sound initialization fails,
simon1 savedialog works
svn-id: r3955
Diffstat (limited to 'morphos')
-rw-r--r-- | morphos/morphos.cpp | 4 | ||||
-rw-r--r-- | morphos/morphos.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/morphos/morphos.cpp b/morphos/morphos.cpp index 8887db05d2..10b8fbda12 100644 --- a/morphos/morphos.cpp +++ b/morphos/morphos.cpp @@ -1562,7 +1562,7 @@ void OSystem_MorphOS::set_mouse_cursor(const byte *buf, uint w, uint h, int hots undraw_mouse(); } -void OSystem_MorphOS::set_sound_proc( void *param, OSystem::SoundProc *proc, byte format ) +bool OSystem_MorphOS::set_sound_proc( void *param, OSystem::SoundProc *proc, byte format ) { static EmulFunc MySoundEmulFunc; @@ -1587,6 +1587,8 @@ void OSystem_MorphOS::set_sound_proc( void *param, OSystem::SoundProc *proc, byt puts( "Failed to create sound thread" ); exit( 1 ); } + + return true; } void OSystem_MorphOS::fill_sound( byte *stream, int len ) diff --git a/morphos/morphos.h b/morphos/morphos.h index be198f4715..c720a990ae 100644 --- a/morphos/morphos.h +++ b/morphos/morphos.h @@ -72,7 +72,7 @@ class OSystem_MorphOS : public OSystem virtual bool poll_event(Event *event); // Set the function to be invoked whenever samples need to be generated - virtual void set_sound_proc(void *param, SoundProc *proc, byte format); + virtual bool set_sound_proc(void *param, SoundProc *proc, byte format); void fill_sound (byte * stream, int len); virtual uint32 property(int param, uint32 value); |