libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 19:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

T7G: start background music at start of input loop (0x0B). Should fix 2474078, but might break other things so I'm not going to backport it.

Browse Source 
svn-id: r36125
This commit is contained in:
Henry Bush 2009-01-28 23:29:19 +00:00
parent 3f06e9c4eb
commit a0a82d911c
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/groovie/music.cpp
View File

@ -33,7 +33,7 @@ namespace Groovie {
MusicPlayer::MusicPlayer(GroovieEngine *vm, const Common::String &gtlName) :
_vm(vm), _midiParser(NULL), _data(NULL), _driver(NULL),
_backgroundFileRef(0), _gameVolume(100), _prevCDtrack(0) {
_backgroundFileRef(0), _gameVolume(100), _prevCDtrack(0), _isPlaying(0) {
// Create the parser
_midiParser = MidiParser::createParser_XMIDI();
@ -174,12 +174,17 @@ void MusicPlayer::setGameVolume(uint16 volume, uint16 time) {
_fadingEndVolume = 100;
}
void MusicPlayer::startBackground() {
if (!_isPlaying && _backgroundFileRef) {
play(_backgroundFileRef, true);
}
}
void MusicPlayer::endTrack() {
debugC(1, kGroovieDebugMIDI | kGroovieDebugAll, "Groovie::Music: End of song");
unload();
if (_backgroundFileRef) {
play(_backgroundFileRef, true);
}
_isPlaying = false;
startBackground();
}
void MusicPlayer::applyFading() {
@ -232,6 +237,7 @@ bool MusicPlayer::play(uint16 fileref, bool loop) {
_midiParser->property(MidiParser::mpAutoLoop, loop);
_gameVolume = 100;
_isPlaying = true;
// Load the new file
return load(fileref);
}

2
engines/groovie/music.h
View File

@ -41,6 +41,7 @@ public:
void playSong(uint16 fileref);
void setBackgroundSong(uint16 fileref);
void playCD(uint8 track);
void startBackground();
// Volume
void setUserVolume(uint16 volume);
@ -99,6 +100,7 @@ private:
MidiParser *_midiParser;
MidiDriver *_driver;
uint8 _musicType;
bool _isPlaying;
uint16 _backgroundFileRef;
uint8 _prevCDtrack;

2
engines/groovie/script.cpp
View File

@ -582,6 +582,8 @@ void Script::o_inputloopstart() {
_mouseClicked = _eventMouseClicked;
_eventMouseClicked = false;
_vm->_musicPlayer->startBackground();
// Save the current pressed character for the whole loop
_kbdChar = _eventKbdChar;
_eventKbdChar = 0;