From 35d4ce0ed75b2575067007a85d5c211d292ebada Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 31 Mar 2013 20:16:39 +0300
Subject: Rename SoundManager sigleton from sound to soundManager.

---
 src/gui/setup_audio.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/gui/setup_audio.cpp')

diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index ea3a46a86..9209bc731 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -77,10 +77,10 @@ Setup_Audio::Setup_Audio(const Widget2 *const widget) :
         "playGuiSound", this, "playGuiSoundEvent");
 
     new SetupItemSlider(_("Sfx volume"), "", "sfxVolume",
-        this, "sfxVolumeEvent", 0, sound.getMaxVolume(), 150, true);
+        this, "sfxVolumeEvent", 0, soundManager.getMaxVolume(), 150, true);
 
     new SetupItemSlider(_("Music volume"), "", "musicVolume",
-        this, "musicVolumeEvent", 0, sound.getMaxVolume(), 150, true);
+        this, "musicVolumeEvent", 0, soundManager.getMaxVolume(), 150, true);
 
     new SetupItemCheckBox(_("Enable music fade out"), "",
         "fadeoutmusic", this, "fadeoutmusicEvent");
@@ -156,20 +156,20 @@ void Setup_Audio::apply()
     SetupTabScroll::apply();
     if (config.getBoolValue("sound"))
     {
-        sound.init();
+        soundManager.init();
         if (viewport && config.getBoolValue("playMusic"))
         {
             const Map *const map = viewport->getMap();
             if (map)
-                sound.playMusic(map->getMusicFile());
+                soundManager.playMusic(map->getMusicFile());
         }
         else
         {
-            sound.stopMusic();
+            soundManager.stopMusic();
         }
     }
     else
     {
-        sound.close();
+        soundManager.close();
     }
 }
-- 
cgit v1.2.3-60-g2f50