[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.97,1.98

Max Horn fingolfin at users.sourceforge.net
Sat Dec 27 07:40:04 CET 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv5722

Modified Files:
	imuse_digi.cpp 
Log Message:
add some comments; convert tabs inside table to spaces (otherwise the table is not really readable unless you have the precise same tab settings as the table author)

Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- imuse_digi.cpp	27 Dec 2003 15:26:04 -0000	1.97
+++ imuse_digi.cpp	27 Dec 2003 15:39:18 -0000	1.98
@@ -61,450 +61,450 @@
 static const imuse_music_table *_digSeqMusicTable;
 #else
 static const imuse_music_map _digStateMusicMap[] = {
-	{0,		0,	0,	0,	0,	0	},
-	{1,		0,	0,	0,	0,	0	},
-	{2,		2,	0,	0,	0,	0	},
-	{4,		3,	0,	0,	0,	0	},
-	{5,		3,	0,	0,	0,	0	},
-	{6,		3,	0,	0,	0,	0	},
-	{7,		3,	0,	0,	0,	0	},
-	{8,		4,	0,	0,	0,	0	},
[...1093 lines suppressed...]
+				// FIXME / TODO: Is FLAG_REVERSE_STEREO really needed here?
+				// How do we know that it is needed? If we indeed have reasons
+				// to believe that it is needed, those should be documented in
+				// a comment here. And if the channels are reversed, then we
+				// might just swap them right here, instead of using the mixer
+				// flag - since we copy the data around anyway, swapping the
+				// channels should be little extra work (in fact, none for
+				// mono data, which includes the 12 bit compressed format).
 				_channel[l].mixerFlags = SoundMixer::FLAG_STEREO | SoundMixer::FLAG_REVERSE_STEREO;
 				_channel[l].mixerSize = _channel[l].freq * 2;
 
@@ -967,7 +975,7 @@
 				} else
 					error("IMuseDigital::startSound() Can't handle %d bit samples", _channel[l].bits);
 			}
-			_channel[l].mixerSize /= 25;
+			_channel[l].mixerSize /= 25;	// FIXME: Why division by 25? Maybe to we achieve a "frame rate" of 25 audio blocks per second?
 			_channel[l].toBeRemoved = false;
 			_channel[l].used = true;
 			break;





More information about the Scummvm-git-logs mailing list