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: 

Removed the ability to set the volume to a value higher than 200% since it didn't work
This commit is contained in:
bgk 2008-08-29 20:11:59 +00:00
parent 5e5d025fd5
commit d257d96941
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gtk/vba.glade
View File

@ -985,22 +985,6 @@
<property name="group">Volume25</property>
</widget>
</child>
<child>
<widget class="GtkRadioMenuItem" id="Volume300">
<property name="visible">True</property>
<property name="label" translatable="yes">300%</property>
<property name="use_underline">True</property>
<property name="group">Volume25</property>
</widget>
</child>
<child>
<widget class="GtkRadioMenuItem" id="Volume400">
<property name="visible">True</property>
<property name="label" translatable="yes">400%</property>
<property name="use_underline">True</property>
<property name="group">Volume25</property>
</widget>
</child>
</widget>
</child>
</widget>

6
src/gtk/window.cpp
View File

@ -81,7 +81,7 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
m_iSoundQualityMin(Sound44K),
m_iSoundQualityMax(Sound11K),
m_fSoundVolumeMin (0.50f),
m_fSoundVolumeMax (4.00f),
m_fSoundVolumeMax (2.00f),
m_iEmulatorTypeMin(EmulatorAuto),
m_iEmulatorTypeMax(EmulatorSGB2),
m_iFilter2xMin (FirstFilter),
@ -556,9 +556,7 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
{ "Volume25", 0.25f },
{ "Volume50", 0.50f },
{ "Volume100", 1.00f },
{ "Volume200", 2.00f },
{ "Volume300", 3.00f },
{ "Volume400", 4.00f }
{ "Volume200", 2.00f }
};
float fDefaultSoundVolume = m_poSoundConfig->oGetKey<float>("volume");
for (guint i = 0; i < G_N_ELEMENTS(astSoundVolume); i++)

6
src/gtk/windowcallbacks.cpp
View File

@ -785,15 +785,15 @@ void Window::vOnSoundQualityToggled(Gtk::CheckMenuItem * _poCMI, int _iSoundQual
m_poSoundConfig->vSetKey("quality", _iSoundQuality);
}
void Window::vOnSoundVolumeToggled(Gtk::CheckMenuItem * _poCMI, float _iSoundVolume)
void Window::vOnSoundVolumeToggled(Gtk::CheckMenuItem * _poCMI, float _fSoundVolume)
{
if (! _poCMI->get_active())
{
return;
}
soundSetVolume(_iSoundVolume);
m_poSoundConfig->vSetKey("volume", _iSoundVolume);
soundSetVolume(_fSoundVolume);
m_poSoundConfig->vSetKey("volume", _fSoundVolume);
}
void Window::vOnGBBorderToggled(Gtk::CheckMenuItem * _poCMI)