diff options
| author | Max Horn | 2003-09-27 16:54:11 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-27 16:54:11 +0000 |
| commit | 49d2a22b428864ccf2298b67841d4cb3cf33b659 (patch) | |
| tree | 11f1ebd799bec7e853bc71671fa045fe9467774c /backends/morphos/morphos.h | |
| parent | e19e7c879a1fc88458a3e26715875e60512d755b (diff) | |
| download | scummvm-rg350-49d2a22b428864ccf2298b67841d4cb3cf33b659.tar.gz scummvm-rg350-49d2a22b428864ccf2298b67841d4cb3cf33b659.tar.bz2 scummvm-rg350-49d2a22b428864ccf2298b67841d4cb3cf33b659.zip | |
OSystem changes: removed create_thread() method (not needed anymore; 'pure' threads aren't very portable anyway, better we only use timers); introduced OSystem::TimerProc type
svn-id: r10430
Diffstat (limited to 'backends/morphos/morphos.h')
| -rw-r--r-- | backends/morphos/morphos.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/backends/morphos/morphos.h b/backends/morphos/morphos.h index 3164af83b4..deea09bbf7 100644 --- a/backends/morphos/morphos.h +++ b/backends/morphos/morphos.h @@ -37,7 +37,7 @@ class OSystem_MorphOS : public OSystem { public: - OSystem_MorphOS(SCALERTYPE gfx_mode, bool full_screen); + OSystem_MorphOS(SCALERTYPE gfx_mode, bool full_screen); virtual ~OSystem_MorphOS(); bool Initialise(); @@ -85,7 +85,7 @@ class OSystem_MorphOS : public OSystem virtual void delay_msecs(uint msecs); // Add a new callback timer - virtual void set_timer(int timer, int (*callback)(int)); + virtual void set_timer(TimerProc callback, int timer); // Mutex handling virtual MutexRef create_mutex(); @@ -93,9 +93,6 @@ class OSystem_MorphOS : public OSystem virtual void unlock_mutex(MutexRef mutex); virtual void delete_mutex(MutexRef mutex); - // Create a thread - virtual void create_thread(ThreadProc *proc, void *param); - // Get the next event. // Returns true if an event was retrieved. virtual bool poll_event(Event *event); @@ -104,7 +101,7 @@ 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 set_sound_proc(SoundProc proc, void *param, SoundFormat format); void fill_sound (byte * stream, int len); void clear_sound_proc(); @@ -180,9 +177,8 @@ class OSystem_MorphOS : public OSystem ColorMap *OvlCMap; /* Sound-related attributes */ - Process *ScummMusicThread; Process *ScummSoundThread; - SoundProc *SoundProc; + SoundProc SoundProc; void *SoundParam; MsgPort *ThreadPort; Message MusicStartup; |