[Scummvm-cvs-logs] CVS: scummvm/backends/dc audio.cpp,1.7,1.8 dc.h,1.15,1.16 dcmain.cpp,1.16,1.17 time.cpp,1.3,1.4

[Max Horn]

Update of /cvsroot/scummvm/scummvm/backends/dc
In directory sc8-pr-cvs1:/tmp/cvs-serv9425/dc

Modified Files:
	audio.cpp dc.h dcmain.cpp time.cpp 
Log Message:
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

Index: audio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/audio.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- audio.cpp	18 Sep 2003 02:07:14 -0000	1.7
+++ audio.cpp	27 Sep 2003 16:54:09 -0000	1.8
@@ -34,7 +34,7 @@
   do_sound_command(CMD_SET_BUFFER(3));
 }
 
-bool OSystem_Dreamcast::set_sound_proc(SoundProc *proc, void *param, SoundFormat format)
+bool OSystem_Dreamcast::set_sound_proc(SoundProc proc, void *param, SoundFormat format)
 {
 #if SAMPLE_MODE == 0
   assert(format == SOUND_16BIT);

Index: dc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dc.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- dc.h	22 Jul 2003 20:36:43 -0000	1.15
+++ dc.h	27 Sep 2003 16:54:09 -0000	1.16
@@ -44,15 +44,12 @@
   // Delay for a specified amount of milliseconds
   void delay_msecs(uint msecs);
   
-  // Create a thread
-  void create_thread(ThreadProc *proc, void *param);
-	
   // Get the next event.
   // Returns true if an event was retrieved.	
   bool poll_event(Event *event);
   
   // Set function that generates samples 
-  bool set_sound_proc(SoundProc *proc, void *param, SoundFormat format);
+  bool set_sound_proc(SoundProc proc, void *param, SoundFormat format);
   void clear_sound_proc();
 		
   // Poll cdrom status
@@ -82,7 +79,7 @@
   void copy_rect_overlay(const int16 *buf, int pitch, int x, int y, int w, int h);
 
   // Add a 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();
@@ -104,7 +101,7 @@
   int _current_shake_pos, _screen_w, _screen_h;
   int _overlay_x, _overlay_y;
   unsigned char *_ms_buf;
-  SoundProc *_sound_proc;
+  SoundProc _sound_proc;
   void *_sound_proc_param;
   bool _overlay_visible, _overlay_dirty, _screen_dirty;
   int _screen_buffer, _overlay_buffer, _mouse_buffer;

Index: dcmain.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dcmain.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- dcmain.cpp	18 Sep 2003 02:07:14 -0000	1.16
+++ dcmain.cpp	27 Sep 2003 16:54:09 -0000	1.17
@@ -127,11 +127,6 @@
   exit(0);
 }
 
-void OSystem_Dreamcast::create_thread(ThreadProc *proc, void *param) {
-  warning("Creating a thread! (not supported.)\n");
-}
-
-
 /* Mutex handling */
 OSystem::MutexRef OSystem_Dreamcast::create_mutex()
 {

Index: time.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/time.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- time.cpp	18 Jun 2003 21:15:08 -0000	1.3
+++ time.cpp	27 Sep 2003 16:54:09 -0000	1.4
@@ -53,7 +53,7 @@
   get_msecs();
 }
 
-void OSystem_Dreamcast::set_timer(int timer, int (*callback)(int))
+void OSystem_Dreamcast::set_timer(TimerProc callback, int timer)
 {
   if (callback != NULL) {
     _timer_duration = timer;