diff --git a/src/gtk/vba.glade b/src/gtk/vba.glade
index b02dcfba..990da66f 100644
--- a/src/gtk/vba.glade
+++ b/src/gtk/vba.glade
@@ -985,22 +985,6 @@
Volume25
-
-
-
-
-
-
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index db75af82..931890fd 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -81,7 +81,7 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr & _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 & _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("volume");
for (guint i = 0; i < G_N_ELEMENTS(astSoundVolume); i++)
diff --git a/src/gtk/windowcallbacks.cpp b/src/gtk/windowcallbacks.cpp
index 0ac9f4c9..1767de62 100644
--- a/src/gtk/windowcallbacks.cpp
+++ b/src/gtk/windowcallbacks.cpp
@@ -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)