diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-03-31 20:16:39 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-03-31 20:16:39 +0300 |
commit | 35d4ce0ed75b2575067007a85d5c211d292ebada (patch) | |
tree | e5749655db88531768635586e52508cefdfd8a5a /src/gui/setup_audio.cpp | |
parent | 8f52bfee633b4aa2f7e49c1e16428d8f1c03fcfc (diff) | |
download | manaplus-35d4ce0ed75b2575067007a85d5c211d292ebada.tar.gz manaplus-35d4ce0ed75b2575067007a85d5c211d292ebada.tar.bz2 manaplus-35d4ce0ed75b2575067007a85d5c211d292ebada.tar.xz manaplus-35d4ce0ed75b2575067007a85d5c211d292ebada.zip |
Rename SoundManager sigleton from sound to soundManager.
Diffstat (limited to 'src/gui/setup_audio.cpp')
-rw-r--r-- | src/gui/setup_audio.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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(); } } |