Implemented libsndfile loader in PhysFS

1 files changed, 33 insertions, 34 deletions

diff --git a/src/sound/oalsound/alsound.h b/src/sound/oalsound/alsound.h
index bb9bf28..1249f14 100644
--- a/src/sound/oalsound/alsound.h
+++ b/src/sound/oalsound/alsound.h
@@ -48,45 +48,44 @@ public:
     ALSound();
     ~ALSound();
 
-    bool Create();
-    bool Cache(Sound, const std::string &);
-    bool CacheMusic(const std::string &);
-
-    bool GetEnable();
-
-    void SetAudioVolume(int volume);
-    int GetAudioVolume();
-    void SetMusicVolume(int volume);
-    int GetMusicVolume();
-
-    void SetListener(const Math::Vector &eye, const Math::Vector &lookat);
-    void FrameMove(float rTime);
-
-    int Play(Sound sound, float amplitude=1.0f, float frequency=1.0f, bool bLoop = false);
-    int Play(Sound sound, const Math::Vector &pos, float amplitude=1.0f, float frequency=1.0f, bool bLoop = false);
-    bool FlushEnvelope(int channel);
-    bool AddEnvelope(int channel, float amplitude, float frequency, float time, SoundNext oper);
-    bool Position(int channel, const Math::Vector &pos);
-    bool Frequency(int channel, float frequency);
-    bool Stop(int channel);
-    bool StopAll();
-    bool MuteAll(bool bMute);
-
-    bool PlayMusic(int rank, bool bRepeat, float fadeTime=2.0f);
-    bool PlayMusic(const std::string &filename, bool bRepeat, float fadeTime=2.0f);
-    bool RestartMusic();
-    void SuspendMusic();
-    void StopMusic(float fadeTime=2.0f);
-    bool IsPlayingMusic();
-    bool PlayPauseMusic(const std::string &filename, bool repeat);
-    void StopPauseMusic();
-
-    bool CheckChannel(int &channel);
+    bool Create() override;
+    bool Cache(Sound, const std::string &) override;
+    bool CacheMusic(const std::string &) override;
+
+    bool GetEnable() override;
+
+    void SetAudioVolume(int volume) override;
+    int GetAudioVolume() override;
+    void SetMusicVolume(int volume) override;
+    int GetMusicVolume() override;
+
+    void SetListener(const Math::Vector &eye, const Math::Vector &lookat) override;
+    void FrameMove(float rTime) override;
+
+    int Play(Sound sound, float amplitude=1.0f, float frequency=1.0f, bool bLoop = false) override;
+    int Play(Sound sound, const Math::Vector &pos, float amplitude=1.0f, float frequency=1.0f, bool bLoop = false) override;
+    bool FlushEnvelope(int channel) override;
+    bool AddEnvelope(int channel, float amplitude, float frequency, float time, SoundNext oper) override;
+    bool Position(int channel, const Math::Vector &pos) override;
+    bool Frequency(int channel, float frequency) override;
+    bool Stop(int channel) override;
+    bool StopAll() override;
+    bool MuteAll(bool bMute) override;
+
+    bool PlayMusic(int rank, bool bRepeat, float fadeTime=2.0f) override;
+    bool PlayMusic(const std::string &filename, bool bRepeat, float fadeTime=2.0f) override;
+    bool RestartMusic() override;
+    void SuspendMusic() override;
+    void StopMusic(float fadeTime=2.0f) override;
+    bool IsPlayingMusic() override;
+    bool PlayPauseMusic(const std::string &filename, bool repeat) override;
+    void StopPauseMusic() override;
 
 private:
     void CleanUp();
     int GetPriority(Sound);
     bool SearchFreeBuffer(Sound sound, int &channel, bool &bAlreadyLoaded);
+    bool CheckChannel(int &channel);
 
     bool m_enabled;
     float m_audioVolume;