[Scummvm-cvs-logs] SF.net SVN: scummvm:[47374] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 47374
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47374&view=rev
Author:   fingolfin
Date:     2010-01-19 11:19:53 +0000 (Tue, 19 Jan 2010)

Log Message:
-----------
Get rid of Mixer::FLAG_REVERSE_STEREO; also change SCUMM's iMuse Digital emulation to reverse stereo again, as it once seems to have been intended

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp
    scummvm/trunk/sound/mixer.cpp
    scummvm/trunk/sound/mixer.h

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp	2010-01-19 10:47:46 UTC (rev 47373)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp	2010-01-19 11:19:53 UTC (rev 47374)
@@ -85,8 +85,6 @@
 		mixerFlags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
 	if (flags & kFlagStereo)
 		mixerFlags |= Audio::Mixer::FLAG_STEREO;
-	if (flags & kFlagReverseStereo)
-		mixerFlags |= Audio::Mixer::FLAG_REVERSE_STEREO;
 	return mixerFlags;
 }
 
@@ -202,9 +200,10 @@
 				track->mixerFlags |= kFlagLittleEndian;
 #endif
 
-			track->stream = Audio::makeQueuingAudioStream(freq, track->mixerFlags & kFlagStereo);
+			track->stream = Audio::makeQueuingAudioStream(freq, (track->mixerFlags & kFlagStereo) != 0);
 
-			_mixer->playInputStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan());
+			_mixer->playInputStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan(),
+							DisposeAfterUse::YES, false, (track->mixerFlags & kFlagReverseStereo) != 0);
 			_mixer->pauseHandle(track->mixChanHandle, true);
 		}
 	}

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2010-01-19 10:47:46 UTC (rev 47373)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2010-01-19 11:19:53 UTC (rev 47374)
@@ -112,7 +112,8 @@
 	track->souStreamUsed = (input != 0);
 
 	if (track->souStreamUsed) {
-		_mixer->playInputStream(track->getType(), &track->mixChanHandle, input, -1, track->getVol(), track->getPan());
+		_mixer->playInputStream(track->getType(), &track->mixChanHandle, input, -1, track->getVol(), track->getPan(),
+							DisposeAfterUse::YES, false, (track->mixerFlags & kFlagReverseStereo) != 0);
 	} else {
 		strcpy(track->soundName, soundName);
 		track->soundDesc = _sound->openSound(soundId, soundName, soundType, volGroupId, -1);
@@ -173,7 +174,8 @@
 		}
 
 		track->stream = Audio::makeQueuingAudioStream(freq, track->mixerFlags & kFlagStereo);
-		_mixer->playInputStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan());
+		_mixer->playInputStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan(),
+							DisposeAfterUse::YES, false, (track->mixerFlags & kFlagReverseStereo) != 0);
 	}
 
 	track->used = true;
@@ -373,7 +375,8 @@
 
 	// Create an appendable output buffer
 	fadeTrack->stream = Audio::makeQueuingAudioStream(_sound->getFreq(fadeTrack->soundDesc), track->mixerFlags & kFlagStereo);
-	_mixer->playInputStream(track->getType(), &fadeTrack->mixChanHandle, fadeTrack->stream, -1, fadeTrack->getVol(), fadeTrack->getPan());
+	_mixer->playInputStream(track->getType(), &fadeTrack->mixChanHandle, fadeTrack->stream, -1, fadeTrack->getVol(), fadeTrack->getPan(),
+							DisposeAfterUse::YES, false, (track->mixerFlags & kFlagReverseStereo) != 0);
 	fadeTrack->used = true;
 
 	debug(5, "cloneToFadeOutTrack() - end of func, soundId %d, fade soundId %d", track->soundId, fadeTrack->soundId);

Modified: scummvm/trunk/sound/mixer.cpp
===================================================================
--- scummvm/trunk/sound/mixer.cpp	2010-01-19 10:47:46 UTC (rev 47373)
+++ scummvm/trunk/sound/mixer.cpp	2010-01-19 11:19:53 UTC (rev 47374)
@@ -231,7 +231,7 @@
 	AudioStream *input = makeRawMemoryStream((byte *)sound, size, autofreeBuffer, rate, flags, loopStart, loopEnd);
 
 	// Play it
-	playInputStream(type, handle, input, id, volume, balance, DisposeAfterUse::YES, false, ((flags & Mixer::FLAG_REVERSE_STEREO) != 0));
+	playInputStream(type, handle, input, id, volume, balance, DisposeAfterUse::YES, false, false);
 }
 
 void MixerImpl::playInputStream(

Modified: scummvm/trunk/sound/mixer.h
===================================================================
--- scummvm/trunk/sound/mixer.h	2010-01-19 10:47:46 UTC (rev 47373)
+++ scummvm/trunk/sound/mixer.h	2010-01-19 11:19:53 UTC (rev 47374)
@@ -85,9 +85,6 @@
 		/** sound is in stereo (default: mono) */
 		FLAG_STEREO = 1 << 3,
 
-		/** reverse the left and right stereo channel */
-		FLAG_REVERSE_STEREO = 1 << 4,
-
 		/** loop the audio */
 		FLAG_LOOP = 1 << 6
 	};


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