[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_mixer.cpp,1.25,1.26 smush_mixer.h,1.7,1.8 smush_player.cpp,1.81,1.82
Max Horn
fingolfin at users.sourceforge.net
Wed Dec 24 09:43:07 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.58,1.59
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.71,1.72 scumm.h,1.335,1.336 scummvm.cpp,2.515,2.516 sound.cpp,1.290,1.291
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv8868/scumm/smush
Modified Files:
smush_mixer.cpp smush_mixer.h smush_player.cpp
Log Message:
o Added SoundMixer::isReady()
o Removed SoundMixer::bindToSystem()
o In scumm, replaced _silentMixer, _silentDigitalImuse and _noDigitalSamples by SoundMixer::isReady()
Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- smush_mixer.cpp 24 Dec 2003 00:24:57 -0000 1.25
+++ smush_mixer.cpp 24 Dec 2003 17:42:20 -0000 1.26
@@ -118,7 +118,7 @@
flags |= SoundMixer::FLAG_UNSIGNED;
}
- if (_silentMixer == false) {
+ if (_mixer->isReady()) {
if (!_channels[i].handle.isActive())
_mixer->newStream(&_channels[i].handle, rate, flags, 500000);
_mixer->appendStream(_channels[i].handle, data, size);
Index: smush_mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- smush_mixer.h 24 Dec 2003 17:29:07 -0000 1.7
+++ smush_mixer.h 24 Dec 2003 17:42:20 -0000 1.8
@@ -53,7 +53,6 @@
bool handleFrame();
bool stop();
bool update();
- bool _silentMixer;
};
} // End of namespace Scumm
Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- smush_player.cpp 24 Dec 2003 00:24:57 -0000 1.81
+++ smush_player.cpp 24 Dec 2003 17:42:20 -0000 1.82
@@ -252,7 +252,6 @@
_smixer = new SmushMixer(_scumm->_mixer);
_scumm->setDirtyColors(0, 255);
- _smixer->_silentMixer = _scumm->_silentDigitalImuse;
_dst = _scumm->virtscr[0].screenPtr + _scumm->virtscr[0].xstart;
g_timer->installTimerProc(&timerCallback, _speed, this);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.58,1.59
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.71,1.72 scumm.h,1.335,1.336 scummvm.cpp,2.515,2.516 sound.cpp,1.290,1.291
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list