From 7873888f72ceb6a026eacac0d791f81cfee80a7c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 25 Feb 2012 01:32:11 +0300 Subject: Replace setuo audio page to new class. --- src/gui/setup_audio.cpp | 173 +++++++++--------------------------------------- src/gui/setup_audio.h | 18 +---- src/sound.cpp | 8 +++ 3 files changed, 43 insertions(+), 156 deletions(-) (limited to 'src') diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp index bc058faf9..1f7db484c 100644 --- a/src/gui/setup_audio.cpp +++ b/src/gui/setup_audio.cpp @@ -23,179 +23,72 @@ #include "gui/setup_audio.h" #include "configuration.h" -#include "logger.h" #include "sound.h" -#include "gui/okdialog.h" #include "gui/viewport.h" -#include "gui/widgets/checkbox.h" -#include "gui/widgets/label.h" #include "gui/widgets/layouthelper.h" -#include "gui/widgets/slider.h" +#include "gui/widgets/scrollarea.h" +#include "gui/widgets/setupitem.h" #include "utils/gettext.h" #include "debug.h" -Setup_Audio::Setup_Audio(): - mMusicVolume(config.getIntValue("musicVolume")), - mSfxVolume(config.getIntValue("sfxVolume")), - mAudioEnabled(config.getBoolValue("sound")), - mGameSoundEnabled(config.getBoolValue("playBattleSound")), - mGuiSoundEnabled(config.getBoolValue("playGuiSound")), - mMusicEnabled(config.getBoolValue("playMusic")), - mMumbleEnabled(config.getBoolValue("enableMumble")), - mDownloadEnabled(config.getBoolValue("download-music")), - mAudioCheckBox(new CheckBox(_("Enable Audio"), mAudioEnabled)), - mGameSoundCheckBox(new CheckBox(_("Enable game sfx"), mGameSoundEnabled)), - mGuiSoundCheckBox(new CheckBox(_("Enable gui sfx"), mGuiSoundEnabled)), - mMusicCheckBox(new CheckBox(_("Enable music"), mMusicEnabled)), - mMumbleCheckBox(new CheckBox(_("Enable mumble voice chat"), - mMumbleEnabled)), - mDownloadMusicCheckBox(new CheckBox(_("Download music"), - mDownloadEnabled)), - mSfxSlider(new Slider(0, sound.getMaxVolume())), - mMusicSlider(new Slider(0, sound.getMaxVolume())) +Setup_Audio::Setup_Audio() { setName(_("Audio")); - setDimension(gcn::Rectangle(0, 0, 250, 200)); - gcn::Label *sfxLabel = new Label(_("Sfx volume")); - gcn::Label *musicLabel = new Label(_("Music volume")); + // Do the layout + LayoutHelper h(this); + ContainerPlacer place = h.getPlacer(0, 0); + place(0, 0, mScroll, 10, 10); - mSfxSlider->setActionEventId("sfx"); - mMusicSlider->setActionEventId("music"); + new SetupItemCheckBox(_("Enable Audio"), "", "sound", this, "soundEvent"); - mSfxSlider->addActionListener(this); - mMusicSlider->addActionListener(this); + new SetupItemCheckBox(_("Enable music"), "", + "playMusic", this, "playMusicEvent"); - mAudioCheckBox->setPosition(10, 10); + new SetupItemCheckBox(_("Enable game sfx"), "", + "playBattleSound", this, "playBattleSoundEvent"); - mSfxSlider->setValue(mSfxVolume); - mMusicSlider->setValue(mMusicVolume); + new SetupItemCheckBox(_("Enable gui sfx"), "", + "playGuiSound", this, "playGuiSoundEvent"); - mSfxSlider->setWidth(90); - mMusicSlider->setWidth(90); + new SetupItemSlider(_("Sfx volume"), "", "sfxVolume", + this, "sfxVolumeEvent", 0, sound.getMaxVolume(), 150, true); - // Do the layout - LayoutHelper h(this); - ContainerPlacer place = h.getPlacer(0, 0); + new SetupItemSlider(_("Music volume"), "", "musicVolume", + this, "musicVolumeEvent", 0, sound.getMaxVolume(), 150, true); + + new SetupItemCheckBox(_("Enable mumble voice chat"), "", + "enableMumble", this, "enableMumbleEvent"); - place(0, 0, mAudioCheckBox); - place(0, 1, mMusicCheckBox); - place(0, 2, mGameSoundCheckBox); - place(0, 3, mGuiSoundCheckBox); - place(0, 4, mSfxSlider); - place(1, 4, sfxLabel); - place(0, 5, mMusicSlider); - place(1, 5, musicLabel); - place(0, 6, mMumbleCheckBox); - place(0, 7, mDownloadMusicCheckBox); - - setDimension(gcn::Rectangle(0, 0, 365, 280)); + new SetupItemCheckBox(_("Download music"), "", + "download-music", this, "download-musicEvent"); + + setDimension(gcn::Rectangle(0, 0, 550, 350)); } void Setup_Audio::apply() { - mAudioEnabled = mAudioCheckBox->isSelected(); - mGameSoundEnabled = mGameSoundCheckBox->isSelected(); - mGuiSoundEnabled = mGuiSoundCheckBox->isSelected(); - mMusicEnabled = mMusicCheckBox->isSelected(); - mMumbleEnabled = mMumbleCheckBox->isSelected(); - mDownloadEnabled = mDownloadMusicCheckBox->isSelected(); - mSfxVolume = config.getIntValue("sfxVolume"); - mMusicVolume = config.getIntValue("musicVolume"); - - config.setValue("sound", mAudioEnabled); - config.setValue("playBattleSound", mGameSoundEnabled); - config.setValue("playGuiSound", mGuiSoundEnabled); - - config.setValue("enableMumble", mMumbleEnabled); - - // Display a message if user has selected to download music, - // And if downloadmusic is not already enabled - if (mDownloadEnabled && !config.getBoolValue("download-music")) - { - new OkDialog(_("Notice"), _("You may have to restart your client " - "if you want to download new music")); - } - config.setValue("download-music", mDownloadEnabled); - - if (mAudioEnabled) + SetupTabScroll::apply(); + if (config.getBoolValue("sound")) { - try + sound.init(); + if (viewport && config.getBoolValue("playMusic")) { - sound.init(); + Map *map = viewport->getMap(); + if (map) + sound.playMusic(map->getMusicFile()); } - catch (const char *err) - { - new OkDialog(_("Sound Engine"), err); - logger->log("Warning: %s", err); - } - if (mMusicEnabled) - { - if (viewport && !config.getBoolValue("playMusic")) - { - Map *map = viewport->getMap(); - if (map) - { - config.setValue("playMusic", mMusicEnabled); - sound.playMusic(map->getMusicFile()); - } - } - } - else if (config.getBoolValue("playMusic")) + else { sound.stopMusic(); } - } else { sound.close(); } - - config.setValue("playMusic", mMusicEnabled); -} - -void Setup_Audio::cancel() -{ - mAudioCheckBox->setSelected(mAudioEnabled); - mGameSoundCheckBox->setSelected(mGameSoundEnabled); - mGuiSoundCheckBox->setSelected(mGuiSoundEnabled); - mMusicCheckBox->setSelected(mMusicEnabled); - mMumbleCheckBox->setSelected(mMumbleEnabled); - mDownloadMusicCheckBox->setSelected(mDownloadEnabled); - - sound.setSfxVolume(mSfxVolume); - mSfxSlider->setValue(mSfxVolume); - - sound.setMusicVolume(mMusicVolume); - mMusicSlider->setValue(mMusicVolume); - - config.setValue("sound", mAudioEnabled); - config.setValue("playBattleSound", mGameSoundEnabled); - config.setValue("playGuiSound", mGuiSoundEnabled); - config.setValue("enableMumble", mMumbleEnabled); - config.setValue("download-music", mDownloadEnabled); - config.setValue("sfxVolume", mSfxVolume); - config.setValue("musicVolume", mMusicVolume); - config.setValue("playMusic", mMusicEnabled); -} - -void Setup_Audio::action(const gcn::ActionEvent &event) -{ - if (event.getId() == "sfx") - { - config.setValueInt("sfxVolume", - static_cast(mSfxSlider->getValue())); - sound.setSfxVolume(static_cast(mSfxSlider->getValue())); - } - else if (event.getId() == "music") - { - config.setValueInt("musicVolume", - static_cast(mMusicSlider->getValue())); - sound.setMusicVolume(static_cast(mMusicSlider->getValue())); - } } diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h index 88869d730..c08c49c7a 100644 --- a/src/gui/setup_audio.h +++ b/src/gui/setup_audio.h @@ -25,30 +25,16 @@ #include "guichanfwd.h" -#include "gui/widgets/setuptab.h" +#include "gui/widgets/setuptabscroll.h" #include -class Setup_Audio : public SetupTab +class Setup_Audio : public SetupTabScroll { public: Setup_Audio(); void apply(); - void cancel(); - - void action(const gcn::ActionEvent &event); - - private: - int mMusicVolume, mSfxVolume; - bool mAudioEnabled, mGameSoundEnabled, mGuiSoundEnabled; - bool mMusicEnabled, mMumbleEnabled; - bool mDownloadEnabled; - - gcn::CheckBox *mAudioCheckBox, *mGameSoundCheckBox, *mGuiSoundCheckBox; - gcn::CheckBox *mMusicCheckBox, *mMumbleCheckBox; - gcn::CheckBox *mDownloadMusicCheckBox; - gcn::Slider *mSfxSlider, *mMusicSlider; }; #endif diff --git a/src/sound.cpp b/src/sound.cpp index 913b55656..25b37d578 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -69,6 +69,8 @@ Sound::~Sound() config.removeListener("playBattleSound", this); config.removeListener("playGuiSound", this); config.removeListener("playMusic", this); + config.removeListener("sfxVolume", this); + config.removeListener("musicVolume", this); // Unlink the callback function. Mix_HookMusicFinished(nullptr); @@ -82,6 +84,10 @@ void Sound::optionChanged(const std::string &value) mPlayGui = config.getBoolValue("playGuiSound"); else if (value == "playMusic") mPlayMusic = config.getBoolValue("playMusic"); + else if (value == "sfxVolume") + setSfxVolume(config.getIntValue("sfxVolume")); + else if (value == "musicVolume") + setMusicVolume(config.getIntValue("musicVolume")); } void Sound::init() @@ -98,6 +104,8 @@ void Sound::init() config.addListener("playBattleSound", this); config.addListener("playGuiSound", this); config.addListener("playMusic", this); + config.addListener("sfxVolume", this); + config.addListener("musicVolume", this); if (SDL_InitSubSystem(SDL_INIT_AUDIO) == -1) { -- cgit v1.2.3-60-g2f50