aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2011-06-11 14:09:03 +0300
committerEugene Sandulenko2011-06-11 14:12:27 +0300
commiteb9b492ce7444400246525a66a316b50f1de2bde (patch)
tree264601e283e989b0df46e3b9c145c70a7f2c7a8e
parenteb13803709ad90df75c38eea4ff1b6c55316ca9b (diff)
downloadscummvm-rg350-eb9b492ce7444400246525a66a316b50f1de2bde.tar.gz
scummvm-rg350-eb9b492ce7444400246525a66a316b50f1de2bde.tar.bz2
scummvm-rg350-eb9b492ce7444400246525a66a316b50f1de2bde.zip
SWORD25: Unstub more sound-related functions
-rw-r--r--engines/sword25/sfx/soundengine.cpp22
1 files changed, 13 insertions, 9 deletions
diff --git a/engines/sword25/sfx/soundengine.cpp b/engines/sword25/sfx/soundengine.cpp
index e650ae6945..9244137c25 100644
--- a/engines/sword25/sfx/soundengine.cpp
+++ b/engines/sword25/sfx/soundengine.cpp
@@ -126,11 +126,15 @@ void SoundEngine::resumeAll() {
}
void SoundEngine::pauseLayer(uint layer) {
- warning("STUB: SoundEngine::pauseLayer(%d)", layer);
+ // Not used in the game
+
+ warning("SoundEngine::pauseLayer(%d)", layer);
}
void SoundEngine::resumeLayer(uint layer) {
- warning("STUB: SoundEngine::resumeLayer(%d)", layer);
+ // Not used in the game
+
+ warning("SoundEngine::resumeLayer(%d)", layer);
}
SndHandle *SoundEngine::getHandle(uint *id) {
@@ -238,7 +242,9 @@ void SoundEngine::stopSound(uint handle) {
}
bool SoundEngine::isSoundPaused(uint handle) {
- warning("STUB: SoundEngine::isSoundPaused(%d)", handle);
+ // Not used in the game
+
+ warning("SoundEngine::isSoundPaused(%d)", handle);
return false;
}
@@ -252,20 +258,18 @@ bool SoundEngine::isSoundPlaying(uint handle) {
}
float SoundEngine::getSoundVolume(uint handle) {
- warning("STUB: SoundEngine::getSoundVolume(%d)", handle);
+ debugC(1, kDebugSound, "SoundEngine::getSoundVolume(%d)", handle);
- return 0;
+ return (float)_mixer->getChannelVolume(_handles[handle].handle) / 255.0;
}
float SoundEngine::getSoundPanning(uint handle) {
- warning("STUB: SoundEngine::getSoundPanning(%d)", handle);
+ debugC(1, kDebugSound, "SoundEngine::getSoundPanning(%d)", handle);
- return 0;
+ return (float)_mixer->getChannelBalance(_handles[handle].handle) / 127.0;
}
Resource *SoundEngine::loadResource(const Common::String &fileName) {
- warning("STUB: SoundEngine::loadResource(%s)", fileName.c_str());
-
return new SoundResource(fileName);
}