aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/sound/sound_manager.h
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-04 21:21:34 -0400
committerPaul Gilbert2016-08-04 21:21:34 -0400
commit23e387fb9086f9fdf2d15c01f29907f1fd593d29 (patch)
tree5ad9a98b26a721f2511ae7d39f3d008d717771b8 /engines/titanic/sound/sound_manager.h
parentb74ec1df8938668b67d54dab44d0a1f96e9de490 (diff)
downloadscummvm-rg350-23e387fb9086f9fdf2d15c01f29907f1fd593d29.tar.gz
scummvm-rg350-23e387fb9086f9fdf2d15c01f29907f1fd593d29.tar.bz2
scummvm-rg350-23e387fb9086f9fdf2d15c01f29907f1fd593d29.zip
TITANIC: Rename WaveFile to CWaveFile for consistency
Diffstat (limited to 'engines/titanic/sound/sound_manager.h')
-rw-r--r--engines/titanic/sound/sound_manager.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/titanic/sound/sound_manager.h b/engines/titanic/sound/sound_manager.h
index 85ee00a3f7..ddfcba0d0f 100644
--- a/engines/titanic/sound/sound_manager.h
+++ b/engines/titanic/sound/sound_manager.h
@@ -46,21 +46,21 @@ public:
* @param name Name of sound resource
* @returns Loaded wave file
*/
- virtual WaveFile *loadSound(const CString &name) { return nullptr; }
+ virtual CWaveFile *loadSound(const CString &name) { return nullptr; }
/**
* Loads a speech resource from a dialogue file
* @param name Name of sound resource
* @returns Loaded wave file
*/
- virtual WaveFile *loadSpeech(CDialogueFile *dialogueFile, int speechId) { return 0; }
+ virtual CWaveFile *loadSpeech(CDialogueFile *dialogueFile, int speechId) { return 0; }
virtual int proc5() const { return 0; }
/**
* Start playing a previously loaded wave file
*/
- virtual int playSound(WaveFile &waveFile, CProximity &prox) = 0;
+ virtual int playSound(CWaveFile &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 WaveFile *waveFile) const { return false; }
+ virtual bool isActive(const CWaveFile *waveFile) const { return false; }
virtual int proc16() const { return 0; }
virtual void WaveMixPump() {}
@@ -136,21 +136,21 @@ public:
* @param name Name of sound resource
* @returns Loaded wave file
*/
- virtual WaveFile *loadSound(const CString &name);
+ virtual CWaveFile *loadSound(const CString &name);
/**
* Loads a speech resource from a dialogue file
* @param name Name of sound resource
* @returns Loaded wave file
*/
- virtual WaveFile *loadSpeech(CDialogueFile *dialogueFile, int speechId);
+ virtual CWaveFile *loadSpeech(CDialogueFile *dialogueFile, int speechId);
virtual int proc5() const;
/**
* Start playing a previously loaded sound resource
*/
- virtual int playSound(WaveFile &waveFile, CProximity &prox);
+ virtual int playSound(CWaveFile &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 WaveFile *soundRes) const;
+ virtual bool isActive(const CWaveFile *soundRes) const;
virtual int proc16() const;
virtual void WaveMixPump();