aboutsummaryrefslogtreecommitdiff
path: root/video/psx_decoder.cpp
diff options
context:
space:
mode:
authorBastien Bouclet2017-07-10 21:36:19 +0200
committerBastien Bouclet2017-07-27 06:40:07 +0200
commitec49730711399c7705211f76bf583ad73a681e16 (patch)
treecedf79022d82766108a26a589958cf5a43383ca8 /video/psx_decoder.cpp
parent22ce8dbf385c08a58222049333554ee206bf933d (diff)
downloadscummvm-rg350-ec49730711399c7705211f76bf583ad73a681e16.tar.gz
scummvm-rg350-ec49730711399c7705211f76bf583ad73a681e16.tar.bz2
scummvm-rg350-ec49730711399c7705211f76bf583ad73a681e16.zip
VIDEO: Allow setting the mixer sound type used to play audio tracks
Diffstat (limited to 'video/psx_decoder.cpp')
-rw-r--r--video/psx_decoder.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/video/psx_decoder.cpp b/video/psx_decoder.cpp
index 4f14e2ea4f..426f5eb608 100644
--- a/video/psx_decoder.cpp
+++ b/video/psx_decoder.cpp
@@ -247,7 +247,7 @@ void PSXStreamDecoder::readNextPacket() {
// We only handle one audio channel so far
if (track == 1) {
if (!_audioTrack) {
- _audioTrack = new PSXAudioTrack(sector);
+ _audioTrack = new PSXAudioTrack(sector, getSoundType());
addTrack(_audioTrack);
}
@@ -308,7 +308,8 @@ static const int s_xaTable[5][2] = {
{ 122, -60 }
};
-PSXStreamDecoder::PSXAudioTrack::PSXAudioTrack(Common::SeekableReadStream *sector) {
+PSXStreamDecoder::PSXAudioTrack::PSXAudioTrack(Common::SeekableReadStream *sector, Audio::Mixer::SoundType soundType) :
+ AudioTrack(soundType) {
assert(sector);
_endOfTrack = false;