[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.3,1.4 driver96.h,1.12,1.13

[Max Horn]

Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv20936/driver

Modified Files:
	d_sound.cpp driver96.h 
Log Message:
StopSpeech -> StopSpeechBS2 (avoid conflict wiht SpeechSynthesis framework on OS X)

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- d_sound.cpp	28 Jul 2003 11:21:25 -0000	1.3
+++ d_sound.cpp	28 Jul 2003 14:50:54 -0000	1.4
@@ -225,7 +225,7 @@
 //
 //	--------------------------------------------------------------------------
 //
-//	int32 StopSpeech(void)
+//	int32 StopSpeechBS2(void)
 //
 //	Stops the speech from playing.
 //
@@ -1131,10 +1131,10 @@
 }
 
 
-int32 StopSpeech(void)
+int32 StopSpeechBS2(void)
 
 {
-	warning("stub StopSpeech");
+	warning("stub StopSpeechBS2");
 /*
 	int32 status;
 

Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- driver96.h	28 Jul 2003 09:49:46 -0000	1.12
+++ driver96.h	28 Jul 2003 14:50:54 -0000	1.13
@@ -824,7 +824,7 @@
 //
 //	--------------------------------------------------------------------------
 //
-//	int32 StopSpeech(void)
+//	int32 StopSpeechBS2(void)
 //
 //	Stops the speech from playing.
 //
@@ -1566,7 +1566,7 @@
 extern int32 PreFetchCompSpeech(const char *filename, uint32 speechid, uint8 *waveMem);
 extern int32 GetCompSpeechSize(const char *filename, uint32 speechid);
 extern int32 AmISpeaking();
-extern int32 StopSpeech(void);
+extern int32 StopSpeechBS2(void);
 extern int32 GetSpeechStatus(void);
 extern int32 PauseSpeech(void);
 extern int32 UnpauseSpeech(void);