aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/cruise/function.cpp8
-rw-r--r--engines/cruise/sound.cpp7
-rw-r--r--engines/cruise/sound.h3
3 files changed, 6 insertions, 12 deletions
diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp
index db7d1eb167..10d05de46c 100644
--- a/engines/cruise/function.cpp
+++ b/engines/cruise/function.cpp
@@ -209,8 +209,8 @@ int16 Op_PlayFX(void) {
if (speed == -1)
speed = filesDatabase[sampleNum].subData.transparency;
- _vm->sound().startSound(channelNum, filesDatabase[sampleNum].subData.ptr,
- filesDatabase[sampleNum].width, speed, volume, false);
+ _vm->sound().playSound(channelNum, filesDatabase[sampleNum].subData.ptr,
+ filesDatabase[sampleNum].width, volume);
}
return (0);
@@ -226,8 +226,8 @@ int16 Op_LoopFX(void) {
if (speed == -1)
speed = filesDatabase[sampleNum].subData.transparency;
- _vm->sound().startSound(channelNum, filesDatabase[sampleNum].subData.ptr,
- filesDatabase[sampleNum].width, speed, volume, true);
+ _vm->sound().playSound(channelNum, filesDatabase[sampleNum].subData.ptr,
+ filesDatabase[sampleNum].width, volume);
}
return (0);
diff --git a/engines/cruise/sound.cpp b/engines/cruise/sound.cpp
index d13a1673bb..3c359e1903 100644
--- a/engines/cruise/sound.cpp
+++ b/engines/cruise/sound.cpp
@@ -757,7 +757,7 @@ void PCSound::fadeOutMusic() {
_player->fadeOut();
}
-void PCSound::playSound(int channel, int frequency, const uint8 *data, int size, int volumeStep, int stepCount, int volume, int repeat) {
+void PCSound::playSound(int channel, const uint8 *data, int size, int volume) {
debugC(5, kCruiseDebugSound, "PCSound::playSound() channel %d size %d", channel, size);
_soundDriver->playSample(data, size, channel, volume);
}
@@ -814,11 +814,6 @@ void PCSound::startNote(int channel, int volume, int freq) {
_soundDriver->setChannelFrequency(channel, freq);
}
-void PCSound::startSound(int channelNum, const byte *ptr, int size, int speed, int volume, bool loop) {
- warning("TODO: validate startSound");
- playSound(channelNum, speed, ptr, size, 0, 0, volume, loop);
-}
-
void PCSound::doSync(Common::Serializer &s) {
_player->doSync(s);
s.syncAsSint16LE(_genVolume);
diff --git a/engines/cruise/sound.h b/engines/cruise/sound.h
index 3c02193086..3280323ad0 100644
--- a/engines/cruise/sound.h
+++ b/engines/cruise/sound.h
@@ -55,8 +55,7 @@ public:
virtual void removeMusic();
virtual void fadeOutMusic();
- virtual void playSound(int channel, int frequency, const uint8 *data, int size, int volumeStep, int stepCount, int volume, int repeat);
- virtual void startSound(int channelNum, const byte *ptr, int size, int speed, int volume, bool loop);
+ virtual void playSound(int channel, const uint8 *data, int size, int volume);
virtual void stopSound(int channel);
void doSync(Common::Serializer &s);