[Scummvm-cvs-logs] SF.net SVN: scummvm:[46551] scummvm/trunk/engines/sci/sfx/soundcmd.cpp

[lordhoto at users.sourceforge.net]

Revision: 46551
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46551&view=rev
Author:   lordhoto
Date:     2009-12-25 13:26:13 +0000 (Fri, 25 Dec 2009)

Log Message:
-----------
Fix compilation.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/soundcmd.cpp

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-25 13:26:09 UTC (rev 46550)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-25 13:26:13 UTC (rev 46551)
@@ -246,7 +246,7 @@
 
 	SongHandle handle = FROBNICATE_HANDLE(obj);
 
-	if (_doSoundVersion != SCI_VERSION_1_LATE) {
+	if (_soundVersion != SCI_VERSION_1_LATE) {
 		if (!obj.segment)
 			return;
 	}
@@ -327,14 +327,14 @@
 		_state->sfx_song_set_status(handle, SOUND_STATUS_PLAYING);
 		_state->sfx_song_set_loops(handle, GET_SEL32V(_segMan, obj, loop));
 		PUT_SEL32V(_segMan, obj, state, kSndStatusPlaying);
-	} else if (_doSoundVersion == SCI_VERSION_1_EARLY) {
+	} else if (_soundVersion == SCI_VERSION_1_EARLY) {
 		_state->sfx_song_set_status(handle, SOUND_STATUS_PLAYING);
 		_state->sfx_song_set_loops(handle, GET_SEL32V(_segMan, obj, loop));
 		_state->sfx_song_renice(handle, GET_SEL32V(_segMan, obj, pri));
 		RESTORE_BEHAVIOR rb = (RESTORE_BEHAVIOR) value;		/* Too lazy to look up a default value for this */
 		_state->_songlib.setSongRestoreBehavior(handle, rb);
 		PUT_SEL32V(_segMan, obj, signal, 0);
-	} else if (_doSoundVersion == SCI_VERSION_1_LATE) {
+	} else if (_soundVersion == SCI_VERSION_1_LATE) {
 		int looping = GET_SEL32V(_segMan, obj, loop);
 		//int vol = GET_SEL32V(_segMan, obj, vol);
 		int pri = GET_SEL32V(_segMan, obj, pri);
@@ -587,7 +587,7 @@
 
 #ifdef USE_OLD_MUSIC_FUNCTIONS
 	SongHandle handle = FROBNICATE_HANDLE(obj);
-	if (_doSoundVersion != SCI_VERSION_1_LATE) {
+	if (_soundVersion != SCI_VERSION_1_LATE) {
 		/*s->sound_server->command(s, SOUND_COMMAND_FADE_HANDLE, obj, 120);*/ /* Fade out in 2 secs */
 		/* FIXME: The next couple of lines actually STOP the handle, rather
 		** than fading it! */
@@ -697,7 +697,7 @@
 		 * below, with proper storage of dataInc and
 		 * signal in the iterator code. */
 		PUT_SEL32V(_segMan, obj, dataInc, signal);
-		if (_doSoundVersion == SCI_VERSION_1_EARLY)
+		if (_soundVersion == SCI_VERSION_1_EARLY)
 			PUT_SEL32V(_segMan, obj, signal, signal);
 		else
 			PUT_SEL32V(_segMan, obj, signal, signal + 127);
@@ -734,7 +734,7 @@
 	//	break;
 	//}
 
-	if (_doSoundVersion == SCI_VERSION_1_EARLY) {
+	if (_soundVersion == SCI_VERSION_1_EARLY) {
 		PUT_SEL32V(_segMan, obj, min, min);
 		PUT_SEL32V(_segMan, obj, sec, sec);
 		PUT_SEL32V(_segMan, obj, frame, frame);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.