diff options
| author | Max Horn | 2010-04-12 09:14:17 +0000 |
|---|---|---|
| committer | Max Horn | 2010-04-12 09:14:17 +0000 |
| commit | a1840bd5732473e3144857c74716ec2d6e4338c2 (patch) | |
| tree | 97a63044cc6cf8617172af41857b6e19fa324d20 /graphics/video | |
| parent | 9191b9d5289b99b197fee8b9234080d03d2194c3 (diff) | |
| download | scummvm-rg350-a1840bd5732473e3144857c74716ec2d6e4338c2.tar.gz scummvm-rg350-a1840bd5732473e3144857c74716ec2d6e4338c2.tar.bz2 scummvm-rg350-a1840bd5732473e3144857c74716ec2d6e4338c2.zip | |
AUDIO: Rename Mixer::playInputStream to playStream
svn-id: r48637
Diffstat (limited to 'graphics/video')
| -rw-r--r-- | graphics/video/avi_decoder.cpp | 2 | ||||
| -rw-r--r-- | graphics/video/coktelvideo/coktelvideo.cpp | 4 | ||||
| -rw-r--r-- | graphics/video/smk_decoder.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/graphics/video/avi_decoder.cpp b/graphics/video/avi_decoder.cpp index 3fb770e6bc..fe5999328e 100644 --- a/graphics/video/avi_decoder.cpp +++ b/graphics/video/avi_decoder.cpp @@ -245,7 +245,7 @@ bool AviDecoder::loadFile(const char *fileName) { // Initialize the video stuff too _audStream = createAudioStream(); if (_audStream) - _mixer->playInputStream(_soundType, _audHandle, _audStream); + _mixer->playStream(_soundType, _audHandle, _audStream); debug (0, "Frames = %d, Dimensions = %d x %d", _header.totalFrames, _header.width, _header.height); debug (0, "Frame Rate = %d", getFrameRate()); diff --git a/graphics/video/coktelvideo/coktelvideo.cpp b/graphics/video/coktelvideo/coktelvideo.cpp index 71ec9eeaad..4d93815b44 100644 --- a/graphics/video/coktelvideo/coktelvideo.cpp +++ b/graphics/video/coktelvideo/coktelvideo.cpp @@ -1068,7 +1068,7 @@ CoktelVideo::State Imd::processFrame(uint16 frame) { } while (hasNextCmd); if (startSound && _soundEnabled) { - _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_audioHandle, _audioStream); + _mixer->playStream(Audio::Mixer::kSFXSoundType, &_audioHandle, _audioStream); _skipFrames = 0; _soundStage = 2; } @@ -2033,7 +2033,7 @@ CoktelVideo::State Vmd::processFrame(uint16 frame) { if (startSound && _soundEnabled) { if (_hasSound && _audioStream) { - _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_audioHandle, _audioStream); + _mixer->playStream(Audio::Mixer::kSFXSoundType, &_audioHandle, _audioStream); _skipFrames = 0; _soundStage = 2; } else diff --git a/graphics/video/smk_decoder.cpp b/graphics/video/smk_decoder.cpp index 28fc547010..a919c60574 100644 --- a/graphics/video/smk_decoder.cpp +++ b/graphics/video/smk_decoder.cpp @@ -584,7 +584,7 @@ bool SmackerDecoder::decodeNextFrame() { } if (!_audioStarted) { - _mixer->playInputStream(_soundType, &_audioHandle, _audioStream, -1, 255); + _mixer->playStream(_soundType, &_audioHandle, _audioStream, -1, 255); _audioStarted = true; } } else { |