# HG changeset patch
# User Christian Birchinger <joker@netswarm.net>
# Date 1198774633 -3600
# Node ID 4b53cd5812e277a25b47d9c5dd1e76be4e3dac9b
# Parent  aa94631d1a02a029e37950f09bee9020949fed09
Re-added 48kHz support to the GUI

diff -r aa94631d1a02 -r 4b53cd5812e2 src/modplug/gui/interface.cxx
--- a/src/modplug/gui/interface.cxx	Tue Dec 25 21:54:17 2007 +0100
+++ b/src/modplug/gui/interface.cxx	Thu Dec 27 17:57:13 2007 +0100
@@ -2,7 +2,9 @@
  * DO NOT EDIT THIS FILE - it is generated by Glade.
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -55,8 +57,9 @@
   GtkWidget *label4;
   GtkWidget *frame3;
   GtkWidget *vbox6;
+  GtkWidget *samp48;
+  GSList *samp48_group = NULL;
   GtkWidget *samp44;
-  GSList *samp44_group = NULL;
   GtkWidget *samp22;
   GtkWidget *samp11;
   GtkWidget *label5;
@@ -129,7 +132,7 @@
 
   Config = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_name (Config, "Config");
-  gtk_widget_set_size_request (Config, -1, -1);
+  gtk_widget_set_size_request (Config, 500, -1);
   gtk_window_set_title (GTK_WINDOW (Config), _("ModPlug Configuration"));
   gtk_window_set_resizable (GTK_WINDOW (Config), FALSE);
 
@@ -279,27 +282,34 @@
   gtk_container_add (GTK_CONTAINER (frame3), vbox6);
   gtk_container_set_border_width (GTK_CONTAINER (vbox6), 2);
 
+  samp48 = gtk_radio_button_new_with_mnemonic (NULL, _("48 kHz"));
+  gtk_widget_set_name (samp48, "samp48");
+  gtk_widget_show (samp48);
+  gtk_box_pack_start (GTK_BOX (vbox6), samp48, FALSE, FALSE, 0);
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (samp48), samp48_group);
+  samp48_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samp48));
+
   samp44 = gtk_radio_button_new_with_mnemonic (NULL, _("44 kHz"));
   gtk_widget_set_name (samp44, "samp44");
   gtk_widget_show (samp44);
   gtk_box_pack_start (GTK_BOX (vbox6), samp44, FALSE, FALSE, 0);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (samp44), samp44_group);
-  samp44_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samp44));
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (samp44), samp48_group);
+  samp48_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samp44));
 
   samp22 = gtk_radio_button_new_with_mnemonic (NULL, _("22 kHz"));
   gtk_widget_set_name (samp22, "samp22");
   gtk_widget_show (samp22);
   gtk_box_pack_start (GTK_BOX (vbox6), samp22, FALSE, FALSE, 0);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (samp22), samp44_group);
-  samp44_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samp22));
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (samp22), samp48_group);
+  samp48_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samp22));
 
   samp11 = gtk_radio_button_new_with_mnemonic (NULL, _("11 kHz"));
   gtk_widget_set_name (samp11, "samp11");
   gtk_widget_show (samp11);
   gtk_box_pack_start (GTK_BOX (vbox6), samp11, FALSE, FALSE, 0);
   gtk_button_set_focus_on_click (GTK_BUTTON (samp11), FALSE);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (samp11), samp44_group);
-  samp44_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samp11));
+  gtk_radio_button_set_group (GTK_RADIO_BUTTON (samp11), samp48_group);
+  samp48_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samp11));
 
   label5 = gtk_label_new (_("Sampling Rate"));
   gtk_widget_set_name (label5, "label5");
@@ -746,6 +756,7 @@
   GLADE_HOOKUP_OBJECT (Config, label4, "label4");
   GLADE_HOOKUP_OBJECT (Config, frame3, "frame3");
   GLADE_HOOKUP_OBJECT (Config, vbox6, "vbox6");
+  GLADE_HOOKUP_OBJECT (Config, samp48, "samp48");
   GLADE_HOOKUP_OBJECT (Config, samp44, "samp44");
   GLADE_HOOKUP_OBJECT (Config, samp22, "samp22");
   GLADE_HOOKUP_OBJECT (Config, samp11, "samp11");
diff -r aa94631d1a02 -r 4b53cd5812e2 src/modplug/gui/modplug.glade
--- a/src/modplug/gui/modplug.glade	Tue Dec 25 21:54:17 2007 +0100
+++ b/src/modplug/gui/modplug.glade	Thu Dec 27 17:57:13 2007 +0100
@@ -378,6 +378,25 @@
 			  <property name="spacing">0</property>
 
 			  <child>
+			    <widget class="GtkRadioButton" id="samp48">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">48 kHz</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
 			    <widget class="GtkRadioButton" id="samp44">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
@@ -388,6 +407,7 @@
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
+			      <property name="group">samp48</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -407,7 +427,7 @@
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
-			      <property name="group">samp44</property>
+			      <property name="group">samp48</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -427,7 +447,7 @@
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
-			      <property name="group">samp44</property>
+			      <property name="group">samp48</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
diff -r aa94631d1a02 -r 4b53cd5812e2 src/modplug/gui/support.cxx
--- a/src/modplug/gui/support.cxx	Tue Dec 25 21:54:17 2007 +0100
+++ b/src/modplug/gui/support.cxx	Thu Dec 27 17:57:13 2007 +0100
@@ -2,7 +2,9 @@
  * DO NOT EDIT THIS FILE - it is generated by Glade.
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff -r aa94631d1a02 -r 4b53cd5812e2 src/modplug/gui/support.h
--- a/src/modplug/gui/support.h	Tue Dec 25 21:54:17 2007 +0100
+++ b/src/modplug/gui/support.h	Thu Dec 27 17:57:13 2007 +0100
@@ -2,7 +2,9 @@
  * DO NOT EDIT THIS FILE - it is generated by Glade.
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <gtk/gtk.h>