From 0d69aea149f7943d40ada238737a494415b9e7c4 Mon Sep 17 00:00:00 2001
From: bgk <bgk@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Fri, 29 Aug 2008 20:11:59 +0000
Subject: [PATCH] GTK: Removed the ability to set the volume to a value higher
 than 200% since it didn't work

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@664 a31d4220-a93d-0410-bf67-fe4944624d44
---
 src/gtk/vba.glade           | 16 ----------------
 src/gtk/window.cpp          |  6 ++----
 src/gtk/windowcallbacks.cpp |  6 +++---
 3 files changed, 5 insertions(+), 23 deletions(-)

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 @@
                                         <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>
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<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++)
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)