diff options
| author | Willem Jan Palenstijn | 2009-01-24 01:29:52 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2009-01-24 01:29:52 +0000 |
| commit | a8ae95cc10ce05329ca9d4c48fcfb06f615de58b (patch) | |
| tree | 23097f1fdd2814a22b4182afaa7132dd66046edc | |
| parent | de341291aa068d7ad2bb6e11c62b98f3e3120552 (diff) | |
| download | scummvm-rg350-a8ae95cc10ce05329ca9d4c48fcfb06f615de58b.tar.gz scummvm-rg350-a8ae95cc10ce05329ca9d4c48fcfb06f615de58b.tar.bz2 scummvm-rg350-a8ae95cc10ce05329ca9d4c48fcfb06f615de58b.zip | |
fixing #2531282: don't fall back to a real audio CD when playing enhanced midi tracks
svn-id: r36030
| -rw-r--r-- | engines/tinsel/music.cpp | 3 | ||||
| -rw-r--r-- | sound/audiocd.cpp | 5 | ||||
| -rw-r--r-- | sound/audiocd.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 54a7656d44..bb6e794f8d 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -199,7 +199,8 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { if (track > 0) { StopMidi(); - AudioCD.play(track, bLoop ? -1 : 1, 0, 0); + // try to play track, but don't fall back to a true CD + AudioCD.play(track, bLoop ? -1 : 1, 0, 0, true); // Check if an enhanced audio track is being played. // If it is, stop here and don't load a MIDI track diff --git a/sound/audiocd.cpp b/sound/audiocd.cpp index b2c91234a4..b1bd474a4c 100644 --- a/sound/audiocd.cpp +++ b/sound/audiocd.cpp @@ -47,7 +47,7 @@ AudioCDManager::AudioCDManager() { assert(_mixer); } -void AudioCDManager::play(int track, int numLoops, int startFrame, int duration) { +void AudioCDManager::play(int track, int numLoops, int startFrame, int duration, bool only_emulate) { if (numLoops != 0 || startFrame != 0) { _cd.track = track; _cd.numLoops = numLoops; @@ -80,7 +80,8 @@ void AudioCDManager::play(int track, int numLoops, int startFrame, int duration) _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_handle, stream); } else { _emulating = false; - g_system->playCD(track, numLoops, startFrame, duration); + if (!only_emulate) + g_system->playCD(track, numLoops, startFrame, duration); } } } diff --git a/sound/audiocd.h b/sound/audiocd.h index ced5410a1f..4c4ff26147 100644 --- a/sound/audiocd.h +++ b/sound/audiocd.h @@ -53,8 +53,9 @@ public: * @param num_loops how often playback should be repeated (-1 = infinitely often). * @param start_frame the frame at which playback should start (75 frames = 1 second). * @param duration the number of frames to play (0: play until end) + * @param only_emulate if true, don't try to play from a real CD */ - void play(int track, int numLoops, int startFrame, int duration); + void play(int track, int numLoops, int startFrame, int duration, bool only_emulate = false); void stop(); bool isPlaying() const; |