From fe3f9ea38cfae89fdd83d4c3fe79ea355f50bce9 Mon Sep 17 00:00:00 2001 From: erihel Date: Thu, 19 Dec 2013 22:41:16 +0100 Subject: Sound support changes * removed 2d sound * fixed listener orientation (propably issue #235) * removed unused code and minor refactoring --- src/sound/sound.cpp | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) (limited to 'src/sound/sound.cpp') diff --git a/src/sound/sound.cpp b/src/sound/sound.cpp index d392612..d197b81 100644 --- a/src/sound/sound.cpp +++ b/src/sound/sound.cpp @@ -36,12 +36,12 @@ CSoundInterface::~CSoundInterface() { } -bool CSoundInterface::Create(bool b3D) +bool CSoundInterface::Create() { return true; } -void CSoundInterface::CacheAll(std::string path) +void CSoundInterface::CacheAll(const std::string &path) { for ( int i = 1; i < SOUND_MAX; i++ ) { @@ -52,7 +52,7 @@ void CSoundInterface::CacheAll(std::string path) } } -void CSoundInterface::AddMusicFiles(std::string path) +void CSoundInterface::AddMusicFiles(const std::string &path) { m_soundPath = path; CacheMusic("Intro1.ogg"); @@ -61,12 +61,12 @@ void CSoundInterface::AddMusicFiles(std::string path) CacheMusic("music011.ogg"); } -bool CSoundInterface::Cache(Sound bSound, std::string bFile) +bool CSoundInterface::Cache(Sound bSound, const std::string &bFile) { return true; } -bool CSoundInterface::CacheMusic(std::string bFile) +bool CSoundInterface::CacheMusic(const std::string &bFile) { return true; } @@ -76,20 +76,6 @@ bool CSoundInterface::GetEnable() return true; } -void CSoundInterface::SetSound3D(bool bMode) -{ -} - -bool CSoundInterface::GetSound3D() -{ - return true; -} - -bool CSoundInterface::GetSound3DCap() -{ - return true; -} - void CSoundInterface::SetAudioVolume(int volume) { } @@ -108,7 +94,7 @@ int CSoundInterface::GetMusicVolume() return 0; } -void CSoundInterface::SetListener(Math::Vector eye, Math::Vector lookat) +void CSoundInterface::SetListener(const Math::Vector &eye, const Math::Vector &lookat) { } @@ -121,7 +107,7 @@ int CSoundInterface::Play(Sound sound, float amplitude, float frequency, bool bL return 0; } -int CSoundInterface::Play(Sound sound, Math::Vector pos, float amplitude, float frequency, bool bLoop) +int CSoundInterface::Play(Sound sound, const Math::Vector &pos, float amplitude, float frequency, bool bLoop) { return 0; } @@ -136,7 +122,7 @@ bool CSoundInterface::AddEnvelope(int channel, float amplitude, float frequency, return true; } -bool CSoundInterface::Position(int channel, Math::Vector pos) +bool CSoundInterface::Position(int channel, const Math::Vector &pos) { return true; } @@ -166,7 +152,7 @@ bool CSoundInterface::PlayMusic(int rank, bool bRepeat) return true; } -bool CSoundInterface::PlayMusic(std::string filename, bool bRepeat) +bool CSoundInterface::PlayMusic(const std::string &filename, bool bRepeat) { return true; } -- cgit v1.2.3-1-g7c22