[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.129,1.130 mixer.h,1.56,1.57

Joost Peters joostp at users.sourceforge.net
Fri Oct 24 18:14:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv13300/sound

Modified Files:
	mixer.cpp mixer.h 
Log Message:
whatever

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- mixer.cpp	24 Oct 2003 23:09:00 -0000	1.129
+++ mixer.cpp	25 Oct 2003 01:11:14 -0000	1.130
@@ -44,7 +44,6 @@
 	RateConverter *_converter;
 	AudioInputStream *_input;
 	byte _volume;
-	byte _flags;
 	int8 _pan;
 	bool _paused;
 
@@ -511,7 +510,6 @@
 	: Channel(mixer, handle) {
 	_id = id;
 	_ptr = (byte *)sound;
-	_flags = flags;
 	_volume = volume;
 	_pan = pan;
 	
@@ -535,10 +533,7 @@
 }
 
 ChannelRaw::~ChannelRaw() {
-	if (_flags & SoundMixer::FLAG_AUTOFREE)
-		free(_ptr);
-	else if (_flags & SoundMixer::FLAG_AUTODELETE)
-		delete _ptr;
+	free(_ptr);
 }
 
 ChannelStream::ChannelStream(SoundMixer *mixer, PlayingSoundHandle *handle,

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- mixer.h	24 Oct 2003 23:09:01 -0000	1.56
+++ mixer.h	25 Oct 2003 01:11:14 -0000	1.57
@@ -55,8 +55,7 @@
 		FLAG_16BITS = 1 << 2,           // sound is 16 bits wide (default: 8bit)
 		FLAG_AUTOFREE = 1 << 3,         // sound buffer is freed automagically at the end of playing
 		FLAG_REVERSE_STEREO = 1 << 4,   // reverse the left and right stereo channel
-		FLAG_LOOP = 1 << 5,             // loop the audio
-		FLAG_AUTODELETE = 1 << 6        // same as AUTOFREE, but uses delete instead of free()
+		FLAG_LOOP = 1 << 5              // loop the audio
 			
 	};
 





More information about the Scummvm-git-logs mailing list