diff options
Diffstat (limited to 'engines/titanic/sound/sound_manager.h')
| -rw-r--r-- | engines/titanic/sound/sound_manager.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engines/titanic/sound/sound_manager.h b/engines/titanic/sound/sound_manager.h index 5a3aa2f01d..85ee00a3f7 100644 --- a/engines/titanic/sound/sound_manager.h +++ b/engines/titanic/sound/sound_manager.h @@ -25,7 +25,7 @@ #include "titanic/support/simple_file.h" #include "titanic/sound/proximity.h" -#include "titanic/sound/sound_resource.h" +#include "titanic/sound/wave_file.h" #include "titanic/true_talk/dialogue_file.h" namespace Titanic { @@ -44,23 +44,23 @@ public: /** * Loads a sound * @param name Name of sound resource - * @returns Loaded sound handle + * @returns Loaded wave file */ - virtual CSoundResource *loadSound(const CString &name) { return nullptr; } + virtual WaveFile *loadSound(const CString &name) { return nullptr; } /** * Loads a speech resource from a dialogue file * @param name Name of sound resource - * @returns Loaded sound handle + * @returns Loaded wave file */ - virtual CSoundResource *loadSpeech(CDialogueFile *dialogueFile, int speechId) { return 0; } + virtual WaveFile *loadSpeech(CDialogueFile *dialogueFile, int speechId) { return 0; } virtual int proc5() const { return 0; } /** - * Start playing a previously loaded sound resource + * Start playing a previously loaded wave file */ - virtual int playSound(CSoundResource &soundRes, CProximity &prox) = 0; + virtual int playSound(WaveFile &waveFile, CProximity &prox) = 0; virtual void proc7() = 0; virtual void proc8(int v) = 0; @@ -74,7 +74,7 @@ public: /** * Returns true if the given sound is currently active */ - virtual bool isActive(const CSoundResource *soundRes) const { return false; } + virtual bool isActive(const WaveFile *waveFile) const { return false; } virtual int proc16() const { return 0; } virtual void WaveMixPump() {} @@ -134,23 +134,23 @@ public: /** * Loads a sound * @param name Name of sound resource - * @returns Loaded sound handle + * @returns Loaded wave file */ - virtual CSoundResource *loadSound(const CString &name); + virtual WaveFile *loadSound(const CString &name); /** * Loads a speech resource from a dialogue file * @param name Name of sound resource - * @returns Loaded sound handle + * @returns Loaded wave file */ - virtual CSoundResource *loadSpeech(CDialogueFile *dialogueFile, int speechId); + virtual WaveFile *loadSpeech(CDialogueFile *dialogueFile, int speechId); virtual int proc5() const; /** * Start playing a previously loaded sound resource */ - virtual int playSound(CSoundResource &soundRes, CProximity &prox); + virtual int playSound(WaveFile &waveFile, CProximity &prox); virtual void proc7(); virtual void proc8(int v); @@ -164,7 +164,7 @@ public: /** * Returns true if the given sound is currently active */ - virtual bool isActive(const CSoundResource *soundRes) const; + virtual bool isActive(const WaveFile *soundRes) const; virtual int proc16() const; virtual void WaveMixPump(); |