ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GTK : Some preparation for the future sound config dialog 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@797 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
bgk 2008-11-01 13:17:17 +00:00
parent 60c9ff0899
commit bc6c4809d1
3 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/gtk/window.cpp
View File

@ -958,6 +958,38 @@ void Window::vApplyConfigFilterIB()
} }
} }
void Window::vApplyConfigMute()
{
bool bMute = m_poSoundConfig->oGetKey<bool>("mute");
if (bMute)
{
soundSetEnable(0x000);
}
else
{
soundSetEnable(0x30f);
}
}
void Window::vApplyConfigVolume()
{
float fSoundVolume = m_poSoundConfig->oGetKey<float>("volume");
soundSetVolume(fSoundVolume);
}
void Window::vApplyConfigSoundQuality()
{
m_eSoundQuality = (ESoundQuality)m_poSoundConfig->oGetKey<int>("quality");
if (m_eCartridge == CartridgeGBA)
{
soundSetQuality(m_eSoundQuality);
}
else if (m_eCartridge == CartridgeGB)
{
gbSoundSetQuality(m_eSoundQuality);
}
}
void Window::vHistoryAdd(const std::string & _rsFile) void Window::vHistoryAdd(const std::string & _rsFile)
{ {
std::string sURL = "file://" + _rsFile; std::string sURL = "file://" + _rsFile;

3
src/gtk/window.h
View File

@ -79,6 +79,9 @@ public:
void vApplyConfigFilter(); void vApplyConfigFilter();
void vApplyConfigFilterIB(); void vApplyConfigFilterIB();
void vApplyConfigScreenArea(); void vApplyConfigScreenArea();
void vApplyConfigMute();
void vApplyConfigVolume();
void vApplyConfigSoundQuality();
void vUpdateScreen(); void vUpdateScreen();
inline ECartridge eGetCartridge() const { return m_eCartridge; } inline ECartridge eGetCartridge() const { return m_eCartridge; }

21
src/gtk/windowcallbacks.cpp
View File

@ -474,15 +474,8 @@ void Window::vOnFlashSizeToggled(Gtk::CheckMenuItem * _poCMI, int _iFlashSize)
void Window::vOnSoundMuteToggled(Gtk::CheckMenuItem * _poCMI) void Window::vOnSoundMuteToggled(Gtk::CheckMenuItem * _poCMI)
{ {
bool bMute = _poCMI->get_active(); bool bMute = _poCMI->get_active();
if (bMute)
{
soundSetEnable(0x000);
}
else
{
soundSetEnable(0x30f);
}
m_poSoundConfig->vSetKey("mute", bMute); m_poSoundConfig->vSetKey("mute", bMute);
vApplyConfigMute();
} }
void Window::vOnSoundQualityToggled(Gtk::CheckMenuItem * _poCMI, int _iSoundQuality) void Window::vOnSoundQualityToggled(Gtk::CheckMenuItem * _poCMI, int _iSoundQuality)
@ -492,16 +485,8 @@ void Window::vOnSoundQualityToggled(Gtk::CheckMenuItem * _poCMI, int _iSoundQual
return; return;
} }
m_eSoundQuality = (ESoundQuality)_iSoundQuality;
if (m_eCartridge == CartridgeGBA)
{
soundSetQuality(_iSoundQuality);
}
else if (m_eCartridge == CartridgeGB)
{
gbSoundSetQuality(_iSoundQuality);
}
m_poSoundConfig->vSetKey("quality", _iSoundQuality); m_poSoundConfig->vSetKey("quality", _iSoundQuality);
vApplyConfigSoundQuality();
} }
void Window::vOnSoundVolumeToggled(Gtk::CheckMenuItem * _poCMI, float _fSoundVolume) void Window::vOnSoundVolumeToggled(Gtk::CheckMenuItem * _poCMI, float _fSoundVolume)
@ -511,8 +496,8 @@ void Window::vOnSoundVolumeToggled(Gtk::CheckMenuItem * _poCMI, float _fSoundVol
return; return;
} }
soundSetVolume(_fSoundVolume);
m_poSoundConfig->vSetKey("volume", _fSoundVolume); m_poSoundConfig->vSetKey("volume", _fSoundVolume);
vApplyConfigVolume();
} }
void Window::vOnGBBorderToggled(Gtk::CheckMenuItem * _poCMI) void Window::vOnGBBorderToggled(Gtk::CheckMenuItem * _poCMI)