[Scummvm-cvs-logs] CVS: scummvm/scumm/smush scumm_renderer.cpp,1.17,1.18
Pawe? Ko?odziejski
aquadran at users.sourceforge.net
Mon Oct 14 23:54:05 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,1.59,1.60 imuse.h,1.12,1.13 saveload.cpp,1.14,1.15 sound.cpp,1.31,1.32 sound.h,1.11,1.12 string.cpp,1.29,1.30
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.13,1.14 mixer.h,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory usw-pr-cvs1:/tmp/cvs-serv27838/smush
Modified Files:
scumm_renderer.cpp
Log Message:
cleanup sfx and music in imuse, changed talkdelay description(disable) in the dig
Index: scumm_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/scumm_renderer.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- scumm_renderer.cpp 8 Oct 2002 07:30:50 -0000 1.17
+++ scumm_renderer.cpp 15 Oct 2002 06:53:42 -0000 1.18
@@ -27,9 +27,9 @@
#include "sound/mixer.h"
#include "scumm/scumm.h"
#include "scumm/sound.h"
+#include "scumm/imuse.h"
#include "scumm/actor.h"
-
class ScummMixer : public Mixer {
private:
SoundMixer * _mixer; //!< pointer to the SoundMixer instance
@@ -188,7 +188,6 @@
_channels[i].chan = 0;
}
}
-// _mixer->stopAll();
return true;
}
@@ -196,7 +195,6 @@
_scumm(scumm),
_smixer(0),
_insaneSpeed(speed) {
-// scumm->_mixer->stopAll();
}
static ScummRenderer * s_renderer;
@@ -207,7 +205,6 @@
Mixer * ScummRenderer::getMixer() {
if(_smixer == 0) {
- _scumm->_sound->pauseBundleMusic(true);
_smixer = new ScummMixer(_scumm->_mixer);
if(!_smixer) error("unable to allocate a smush mixer");
s_renderer = this;
@@ -224,6 +221,9 @@
delete _smixer;
_smixer = 0;
}
+ if (_scumm->_imuseDigital) {
+ _scumm->_imuseDigital->pause(false);
+ }
_scumm->_sound->pauseBundleMusic(false);
_scumm->_fullRedraw = 1;
_scumm->redrawBGAreas();
@@ -240,6 +240,9 @@
}
bool ScummRenderer::startDecode(const char * fname, int32 version, int32 nbframes) {
+ if (_scumm->_imuseDigital) {
+ _scumm->_imuseDigital->pause(true);
+ }
_scumm->_sound->pauseBundleMusic(true);
_scumm->_videoFinished = false;
_scumm->_insaneState = true;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,1.59,1.60 imuse.h,1.12,1.13 saveload.cpp,1.14,1.15 sound.cpp,1.31,1.32 sound.h,1.11,1.12 string.cpp,1.29,1.30
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.13,1.14 mixer.h,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list