[Scummvm-cvs-logs] CVS: scummvm/bs2 speech.cpp,1.7,1.8 startup.cpp,1.4,1.5

[Max Horn]

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

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

Index: speech.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/speech.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- speech.cpp	28 Jul 2003 11:21:25 -0000	1.7
+++ speech.cpp	28 Jul 2003 14:50:53 -0000	1.8
@@ -1704,7 +1704,7 @@
 
 			if (speechRunning)							// if speech sample playing
 			{
-				StopSpeech();							// halt the sample prematurely
+				StopSpeechBS2();							// halt the sample prematurely
 			}
 		}
 	}

Index: startup.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/startup.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- startup.cpp	28 Jul 2003 09:49:45 -0000	1.4
+++ startup.cpp	28 Jul 2003 14:50:54 -0000	1.5
@@ -291,7 +291,7 @@
 			//---------------------------------------------
 
 			UnpauseSpeech();
-			StopSpeech();							// halt the sample prematurely
+			StopSpeechBS2();							// halt the sample prematurely
 
 			//--------------------------------------------------------------
 			// clean out all resources & flags, ready for a total restart (James24mar97)