aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2011-10-29 00:37:08 +0200
committerJohannes Schickel2011-10-29 01:00:18 +0200
commit5be3ac9fcc7e057e74bb8eff9c0d234f887a0a50 (patch)
tree558721501f5f007782fb1cf2ba7d9e1b6bc82be3
parentd0bc84d5b7fd9fea384ee25f22720b68ee78a83b (diff)
downloadscummvm-rg350-5be3ac9fcc7e057e74bb8eff9c0d234f887a0a50.tar.gz
scummvm-rg350-5be3ac9fcc7e057e74bb8eff9c0d234f887a0a50.tar.bz2
scummvm-rg350-5be3ac9fcc7e057e74bb8eff9c0d234f887a0a50.zip
KYRA: Move non-empty virtual methods of Sound from sound.h to sound.cpp.
-rw-r--r--engines/kyra/sound.cpp16
-rw-r--r--engines/kyra/sound.h8
2 files changed, 20 insertions, 4 deletions
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp
index 0e83c1cb1f..77fd8e2346 100644
--- a/engines/kyra/sound.cpp
+++ b/engines/kyra/sound.cpp
@@ -43,6 +43,22 @@ Sound::Sound(KyraEngine_v1 *vm, Audio::Mixer *mixer)
Sound::~Sound() {
}
+Sound::kType Sound::getSfxType() const {
+ return getMusicType();
+}
+
+void Sound::setSoundList(const AudioDataStruct *list) {
+ _soundDataList = list;
+}
+
+bool Sound::hasSoundFile(uint file) const {
+ return (fileListEntry(file) != 0);
+}
+
+bool Sound::isPlaying() const {
+ return false;
+}
+
bool Sound::voiceFileIsPresent(const char *file) {
for (int i = 0; _supportedCodecs[i].fileext; ++i) {
Common::String f = file;
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index c3c32331be..36e7058182 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -58,7 +58,7 @@ public:
};
virtual kType getMusicType() const = 0;
- virtual kType getSfxType() const { return getMusicType(); }
+ virtual kType getSfxType() const;
/**
* Initializes the output device.
@@ -83,7 +83,7 @@ public:
*
* @param list soundfile list
*/
- virtual void setSoundList(const AudioDataStruct *list) { _soundDataList = list; }
+ virtual void setSoundList(const AudioDataStruct *list);
/**
* Checks if a given sound file is present.
@@ -91,7 +91,7 @@ public:
* @param track track number
* @return true if available, false otherwise
*/
- virtual bool hasSoundFile(uint file) const { return (fileListEntry(file) != 0); }
+ virtual bool hasSoundFile(uint file) const;
/**
* Load a specifc sound file for use of
@@ -140,7 +140,7 @@ public:
*
* @return true if playing, false otherwise
*/
- virtual bool isPlaying() const { return false; }
+ virtual bool isPlaying() const;
/**
* Starts fading out the volume.