aboutsummaryrefslogtreecommitdiff
path: root/engines/gob
diff options
context:
space:
mode:
authorMax Horn2010-01-08 22:09:43 +0000
committerMax Horn2010-01-08 22:09:43 +0000
commitf720d99b0a4fdc97d4d5c01b8c4db43c318c62b1 (patch)
treeb628cb494432e593a24a19134817798d14672048 /engines/gob
parent490153232a89bc64deb8a2ea72443af986940e63 (diff)
downloadscummvm-rg350-f720d99b0a4fdc97d4d5c01b8c4db43c318c62b1.tar.gz
scummvm-rg350-f720d99b0a4fdc97d4d5c01b8c4db43c318c62b1.tar.bz2
scummvm-rg350-f720d99b0a4fdc97d4d5c01b8c4db43c318c62b1.zip
Switch Mixer::playInputStream to use DisposeAfterUse::Flag
svn-id: r47182
Diffstat (limited to 'engines/gob')
-rw-r--r--engines/gob/global.h4
-rw-r--r--engines/gob/sound/adlib.cpp2
-rw-r--r--engines/gob/sound/infogrames.cpp2
-rw-r--r--engines/gob/sound/pcspeaker.cpp2
-rw-r--r--engines/gob/sound/protracker.cpp2
-rw-r--r--engines/gob/sound/soundmixer.cpp2
6 files changed, 7 insertions, 7 deletions
diff --git a/engines/gob/global.h b/engines/gob/global.h
index c86e321737..4fce5952eb 100644
--- a/engines/gob/global.h
+++ b/engines/gob/global.h
@@ -45,8 +45,8 @@ namespace Gob {
#define INTERSOUND_FLAG 0x0002
#define SPEAKER_FLAG 0x0001
-#define NO 0
-#define YES 1
+//#define NO 0
+//#define YES 1
#define UNDEF 2
#define F1_KEY 0x3B00
diff --git a/engines/gob/sound/adlib.cpp b/engines/gob/sound/adlib.cpp
index f925fc5b47..7566a9f8c7 100644
--- a/engines/gob/sound/adlib.cpp
+++ b/engines/gob/sound/adlib.cpp
@@ -75,7 +75,7 @@ void AdLib::init() {
setFreqs();
_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_handle,
- this, -1, 255, 0, false, true);
+ this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
int AdLib::readBuffer(int16 *buffer, const int numSamples) {
diff --git a/engines/gob/sound/infogrames.cpp b/engines/gob/sound/infogrames.cpp
index c955dba43f..7c338a5544 100644
--- a/engines/gob/sound/infogrames.cpp
+++ b/engines/gob/sound/infogrames.cpp
@@ -67,7 +67,7 @@ void Infogrames::play() {
if (_song && !_mixer->isSoundHandleActive(_handle)) {
_song->restart();
_mixer->playInputStream(Audio::Mixer::kMusicSoundType,
- &_handle, _song, -1, 255, 0, false);
+ &_handle, _song, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
}
}
diff --git a/engines/gob/sound/pcspeaker.cpp b/engines/gob/sound/pcspeaker.cpp
index 0d1fc0a6db..43b54c5aea 100644
--- a/engines/gob/sound/pcspeaker.cpp
+++ b/engines/gob/sound/pcspeaker.cpp
@@ -31,7 +31,7 @@ PCSpeaker::PCSpeaker(Audio::Mixer &mixer) : _mixer(&mixer) {
_stream = new Audio::PCSpeaker(_mixer->getOutputRate());
_mixer->playInputStream(Audio::Mixer::kSFXSoundType,
- &_handle, _stream, -1, 50, 0, false, true);
+ &_handle, _stream, -1, 50, 0, DisposeAfterUse::NO, true);
}
PCSpeaker::~PCSpeaker() {
diff --git a/engines/gob/sound/protracker.cpp b/engines/gob/sound/protracker.cpp
index 3e33cfd494..9630610fa3 100644
--- a/engines/gob/sound/protracker.cpp
+++ b/engines/gob/sound/protracker.cpp
@@ -53,7 +53,7 @@ bool Protracker::play(const char *fileName) {
return false;
_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_handle,
- _protrackerStream, -1, 255, 0, false);
+ _protrackerStream, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
return true;
}
diff --git a/engines/gob/sound/soundmixer.cpp b/engines/gob/sound/soundmixer.cpp
index eb6d7882f0..bf7d85d544 100644
--- a/engines/gob/sound/soundmixer.cpp
+++ b/engines/gob/sound/soundmixer.cpp
@@ -51,7 +51,7 @@ SoundMixer::SoundMixer(Audio::Mixer &mixer, Audio::Mixer::SoundType type) : _mix
_fadeSamples = 0;
_curFadeSamples = 0;
- _mixer->playInputStream(type, &_handle, this, -1, 255, 0, false, true);
+ _mixer->playInputStream(type, &_handle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
SoundMixer::~SoundMixer() {