Rename SoundManager sigleton from sound to soundManager.

4 files changed, 8 insertions, 8 deletions

diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index f219bb661..31ae6a84b 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -289,7 +289,7 @@ void ChatTab::chatLog(std::string line, Own own,
                 if (chatWindow && chatWindow->findHighlight(tmp.text))
                 {
                     setFlash(2);
-                    sound.playGuiSound(SOUND_HIGHLIGHT);
+                    soundManager.playGuiSound(SOUND_HIGHLIGHT);
                 }
                 else
                 {
@@ -299,7 +299,7 @@ void ChatTab::chatLog(std::string line, Own own,
             else if (getFlash() == 2)
             {
                 if (chatWindow && chatWindow->findHighlight(tmp.text))
-                    sound.playGuiSound(SOUND_HIGHLIGHT);
+                    soundManager.playGuiSound(SOUND_HIGHLIGHT);
             }
         }
 
@@ -312,7 +312,7 @@ void ChatTab::chatLog(std::string line, Own own,
             {
                 if (chatWindow)
                     chatWindow->unHideWindow();
-                sound.playGuiSound(SOUND_GLOBAL);
+                soundManager.playGuiSound(SOUND_GLOBAL);
             }
             else if (own != BY_SERVER)
             {
@@ -510,7 +510,7 @@ void ChatTab::addNewRow(std::string &line)
 
 void ChatTab::playNewMessageSound()
 {
-    sound.playGuiSound(SOUND_WHISPER);
+    soundManager.playGuiSound(SOUND_WHISPER);
 }
 
 void ChatTab::showOnline(const std::string &nick,
diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp
index 5917fbda4..bb85e1a5b 100644
--- a/src/gui/widgets/guildchattab.cpp
+++ b/src/gui/widgets/guildchattab.cpp
@@ -134,7 +134,7 @@ void GuildChatTab::saveToLogFile(std::string &msg)
 
 void GuildChatTab::playNewMessageSound()
 {
-    sound.playGuiSound(SOUND_GUILD);
+    soundManager.playGuiSound(SOUND_GUILD);
 }
 
 void GuildChatTab::optionChanged(const std::string &value)
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index fbb24d2b6..54e1102a6 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -1037,7 +1037,7 @@ void SetupItemSound::action(const gcn::ActionEvent &event)
     {
         if (mSlider->getSelected())
         {
-            sound.playGuiSfx(branding.getStringValue("systemsounds")
+            soundManager.playGuiSfx(branding.getStringValue("systemsounds")
                 .append(mSlider->getSelectedString()).append(".ogg"));
         }
     }
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 54ed4764f..63c5b6629 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -578,7 +578,7 @@ void Window::setVisible(bool visible, bool forceSticky)
     if (visible)
     {
         if (mPlayVisibleSound)
-            sound.playGuiSound(SOUND_SHOW_WINDOW);
+            soundManager.playGuiSound(SOUND_SHOW_WINDOW);
         if (gui)
         {
             gcn::MouseEvent *event = reinterpret_cast<gcn::MouseEvent*>(
@@ -599,7 +599,7 @@ void Window::setVisible(bool visible, bool forceSticky)
     else
     {
         if (mPlayVisibleSound)
-            sound.playGuiSound(SOUND_HIDE_WINDOW);
+            soundManager.playGuiSound(SOUND_HIDE_WINDOW);
     }
 }