From fed19cb66ae5b56dd7dc81b90edd5a0d15986678 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Mon, 13 Aug 2012 03:42:30 +0200 Subject: WINTERMUTE: WinterMute -> Wintermute --- engines/wintermute/base/sound/base_sound.cpp | 4 ++-- engines/wintermute/base/sound/base_sound.h | 4 ++-- engines/wintermute/base/sound/base_sound_buffer.cpp | 6 +++--- engines/wintermute/base/sound/base_sound_buffer.h | 4 ++-- engines/wintermute/base/sound/base_sound_manager.cpp | 4 ++-- engines/wintermute/base/sound/base_sound_manager.h | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'engines/wintermute/base/sound') diff --git a/engines/wintermute/base/sound/base_sound.cpp b/engines/wintermute/base/sound/base_sound.cpp index 7e32552d08..aac68baccd 100644 --- a/engines/wintermute/base/sound/base_sound.cpp +++ b/engines/wintermute/base/sound/base_sound.cpp @@ -31,7 +31,7 @@ #include "engines/wintermute/base/sound/base_sound_manager.h" #include "engines/wintermute/base/sound/base_sound_buffer.h" -namespace WinterMute { +namespace Wintermute { IMPLEMENT_PERSISTENT(BaseSound, false) @@ -289,4 +289,4 @@ bool BaseSound::applyFX(TSFXType type, float param1, float param2, float param3, return STATUS_OK; } -} // end of namespace WinterMute +} // end of namespace Wintermute diff --git a/engines/wintermute/base/sound/base_sound.h b/engines/wintermute/base/sound/base_sound.h index cadba77bc8..fcc463ed06 100644 --- a/engines/wintermute/base/sound/base_sound.h +++ b/engines/wintermute/base/sound/base_sound.h @@ -34,7 +34,7 @@ #include "engines/wintermute/persistent.h" #include "audio/mixer.h" -namespace WinterMute { +namespace Wintermute { class BaseSoundBuffer; class BaseSound : public BaseClass { @@ -82,6 +82,6 @@ private: BaseSoundBuffer *_sound; }; -} // end of namespace WinterMute +} // end of namespace Wintermute #endif diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp index ac329704bc..14bbcd9421 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.cpp +++ b/engines/wintermute/base/sound/base_sound_buffer.cpp @@ -41,7 +41,7 @@ #include "common/system.h" #include "common/substream.h" -namespace WinterMute { +namespace Wintermute { ////////////////////////////////////////////////////////////////////// // Construction/Destruction @@ -93,7 +93,7 @@ void BaseSoundBuffer::setStreaming(bool streamed, uint32 numBlocks, uint32 block ////////////////////////////////////////////////////////////////////////// bool BaseSoundBuffer::loadFromFile(const Common::String &filename, bool forceReload) { - debugC(kWinterMuteDebugAudio, "BSoundBuffer::LoadFromFile(%s,%d)", filename.c_str(), forceReload); + debugC(kWintermuteDebugAudio, "BSoundBuffer::LoadFromFile(%s,%d)", filename.c_str(), forceReload); // Load a file, but avoid having the File-manager handle the disposal of it. _file = BaseFileManager::getEngineInstance()->openFile(filename, true, false); @@ -290,4 +290,4 @@ bool BaseSoundBuffer::applyFX(TSFXType type, float param1, float param2, float p return STATUS_OK; } -} // end of namespace WinterMute +} // end of namespace Wintermute diff --git a/engines/wintermute/base/sound/base_sound_buffer.h b/engines/wintermute/base/sound/base_sound_buffer.h index 7aec144283..3ec4d4d28b 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.h +++ b/engines/wintermute/base/sound/base_sound_buffer.h @@ -39,7 +39,7 @@ class SeekableAudioStream; class SoundHandle; } -namespace WinterMute { +namespace Wintermute { class BaseFile; class BaseSoundBuffer : public BaseClass { @@ -95,6 +95,6 @@ private: int _volume; }; -} // end of namespace WinterMute +} // end of namespace Wintermute #endif diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp index 95b7d040ab..2bfe0499f9 100644 --- a/engines/wintermute/base/sound/base_sound_manager.cpp +++ b/engines/wintermute/base/sound/base_sound_manager.cpp @@ -37,7 +37,7 @@ #include "common/config-manager.h" #include "audio/mixer.h" -namespace WinterMute { +namespace Wintermute { ////////////////////////////////////////////////////////////////////// // Construction/Destruction @@ -279,4 +279,4 @@ float BaseSoundMgr::posToPan(int x, int y) { return minPan + relPos * (maxPan - minPan); } -} // end of namespace WinterMute +} // end of namespace Wintermute diff --git a/engines/wintermute/base/sound/base_sound_manager.h b/engines/wintermute/base/sound/base_sound_manager.h index a2b8f2c9e9..a0b9a4bc4b 100644 --- a/engines/wintermute/base/sound/base_sound_manager.h +++ b/engines/wintermute/base/sound/base_sound_manager.h @@ -34,7 +34,7 @@ #include "audio/mixer.h" #include "common/array.h" -namespace WinterMute { +namespace Wintermute { class BaseSoundBuffer; class BaseSoundMgr : public BaseClass { public: @@ -63,6 +63,6 @@ public: void saveSettings(); }; -} // end of namespace WinterMute +} // end of namespace Wintermute #endif -- cgit v1.2.3