Rebranding.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@67621 e17a0e51-4ae3-4d35-97c3-1a29b211df97

4 files changed, 174 insertions, 135 deletions

diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am
index 3b48eefd..54ee4315 100644
--- a/plugins/dfsound/Makefile.am
+++ b/plugins/dfsound/Makefile.am
@@ -5,7 +5,7 @@ libdir = @libdir@/games/psemu/
 

 lib_LTLIBRARIES = libDFSound.la

 

-libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c registers.c externals.c

+libDFSound_la_SOURCES = adsr.c adsr.h spu.c spu.h cfg.c cfg.h dma.c dma.h gauss_i.h freeze.c reverb.c reverb.h registers.c registers.h externals.c externals.h dsoundoss.h psemuxa.h regs.h xa.c xa.h stdafx.h

 

 libDFSound_la_CPPFLAGS = $(AM_CPPFLAGS)

 libDFSound_la_LDFLAGS = -module -avoid-version 

@@ -42,10 +42,10 @@ endif
 bin_PROGRAMS = cfgDFSound

 cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \

 	-DDATADIR=\"${datadir}/psemu/\" \

-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) $(AM_CPPFLAGS)

+	$(GTK2_CFLAGS) $(AM_CPPFLAGS)

 cfgDFSound_SOURCES = spucfg-0.1df/main.c

-cfgDFSound_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)

+cfgDFSound_LDADD = $(GTK2_LIBS)

 

-glade_DATA = spucfg-0.1df/dfsound.glade2

+glade_DATA = spucfg-0.1df/dfsound.ui

 gladedir = $(datadir)/psemu/

 EXTRA_DIST = $(glade_DATA)

diff --git a/plugins/dfsound/pulseaudio.c b/plugins/dfsound/pulseaudio.c
index 19b1e0b8..bd43bb5a 100644
--- a/plugins/dfsound/pulseaudio.c
+++ b/plugins/dfsound/pulseaudio.c
@@ -150,7 +150,7 @@ void SetupSound (void)
 

      // Acquire context ////////////////////////////////////////////////////////

      device.api = pa_threaded_mainloop_get_api (device.mainloop);

-     device.context = pa_context_new (device.api, "PCSX");

+     device.context = pa_context_new (device.api, "PCSXR");

      pa_context_set_state_callback (device.context, context_state_cb, &device);

 

      if (device.context == NULL)

@@ -214,7 +214,7 @@ void SetupSound (void)
      //fprintf (stderr, "Target buffer size: %lu\n", buffer_attributes.tlength);

 

      // Acquire new stream using spec //////////////////////////////////////////

-     device.stream = pa_stream_new (device.context, "PCSX", &device.spec, NULL);

+     device.stream = pa_stream_new (device.context, "PCSXR", &device.spec, NULL);

      if (device.stream == NULL)

      {

 	  error_number = pa_context_errno (device.context);

diff --git a/plugins/dfsound/spucfg-0.1df/dfsound.glade2 b/plugins/dfsound/spucfg-0.1df/dfsound.ui
index d2729bb8..e0012de4 100644
--- a/plugins/dfsound/spucfg-0.1df/dfsound.glade2
+++ b/plugins/dfsound/spucfg-0.1df/dfsound.ui
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.8 -->
+<interface>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
-  <widget class="GtkWindow" id="CfgWnd">
+  <object class="GtkWindow" id="CfgWnd">
     <property name="visible">True</property>
     <property name="border_width">10</property>
     <property name="title" translatable="yes">Configure Sound</property>
@@ -12,23 +12,23 @@
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_CfgWnd_destroy"/>
     <child>
-      <widget class="GtkVBox" id="vbox1">
+      <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
-          <widget class="GtkFrame" id="frame1">
+          <object class="GtkFrame" id="frame1">
             <property name="visible">True</property>
             <property name="label_xalign">0</property>
             <child>
-              <widget class="GtkAlignment" id="alignment4">
+              <object class="GtkAlignment" id="alignment4">
                 <property name="visible">True</property>
                 <property name="top_padding">6</property>
                 <property name="bottom_padding">6</property>
                 <property name="left_padding">12</property>
                 <property name="right_padding">12</property>
                 <child>
-                  <widget class="GtkTable" id="table1">
+                  <object class="GtkTable" id="table1">
                     <property name="visible">True</property>
                     <property name="border_width">6</property>
                     <property name="n_rows">3</property>
@@ -36,24 +36,24 @@
                     <property name="column_spacing">6</property>
                     <property name="row_spacing">6</property>
                     <child>
-                      <widget class="GtkLabel" id="label1v">
+                      <object class="GtkLabel" id="label1v">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Volume:</property>
                         <property name="justify">right</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label9">
+                      <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Interpolation:</property>
                         <property name="justify">right</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="top_attach">2</property>
                         <property name="bottom_attach">3</property>
@@ -62,12 +62,12 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label8">
+                      <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Reverb:</property>
                         <property name="justify">right</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
@@ -76,14 +76,16 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkComboBox" id="cbVolume2">
+                      <object class="GtkComboBox" id="cbVolume2">
                         <property name="visible">True</property>
-                        <property name="items" translatable="yes">None
-Low
-Medium
-Loud
-Loudest</property>
-                      </widget>
+                        <property name="model">liststoreVolume</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="cellrenderertextVolume"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
@@ -91,12 +93,16 @@ Loudest</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkComboBox" id="cbReverb2">
+                      <object class="GtkComboBox" id="cbReverb2">
                         <property name="visible">True</property>
-                        <property name="items" translatable="yes">Off
-Simple
-Playstation</property>
-                      </widget>
+                        <property name="model">liststoreReverb</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="cellrenderertextReverb"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
@@ -107,13 +113,16 @@ Playstation</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkComboBox" id="cbInterpolation2">
+                      <object class="GtkComboBox" id="cbInterpolation2">
                         <property name="visible">True</property>
-                        <property name="items" translatable="yes">None
-Simple
-Gaussian
-Cubic</property>
-                      </widget>
+                        <property name="model">liststoreInterpolation</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="cellrenderertextInterpolation"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
@@ -123,104 +132,84 @@ Cubic</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="type">label_item</property>
-              </packing>
-            </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkFrame" id="frame2">
+          <object class="GtkFrame" id="frame2">
             <property name="visible">True</property>
             <property name="label_xalign">0</property>
             <child>
-              <widget class="GtkAlignment" id="alignment2">
+              <object class="GtkAlignment" id="alignment2">
                 <property name="visible">True</property>
                 <property name="top_padding">6</property>
                 <property name="bottom_padding">6</property>
                 <property name="left_padding">12</property>
                 <property name="right_padding">12</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox3">
+                  <object class="GtkVBox" id="vbox3">
                     <property name="visible">True</property>
                     <property name="border_width">6</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
-                      <widget class="GtkCheckButton" id="chkXASpeed">
+                      <object class="GtkCheckButton" id="chkXASpeed">
                         <property name="label" translatable="yes">Adjust XA speed</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip" translatable="yes">Choose this if XA music is played too quickly.</property>
+                        <property name="tooltip_text" translatable="yes">Choose this if XA music is played too quickly.</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label11">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;XA Music&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="type">label_item</property>
-              </packing>
-            </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkFrame" id="frame3">
+          <object class="GtkFrame" id="frame3">
             <property name="visible">True</property>
             <property name="label_xalign">0</property>
             <child>
-              <widget class="GtkAlignment" id="alignment3">
+              <object class="GtkAlignment" id="alignment3">
                 <property name="visible">True</property>
                 <property name="top_padding">6</property>
                 <property name="bottom_padding">6</property>
                 <property name="left_padding">12</property>
                 <property name="right_padding">12</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox4">
+                  <object class="GtkVBox" id="vbox4">
                     <property name="visible">True</property>
                     <property name="border_width">6</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
-                      <widget class="GtkCheckButton" id="chkHiCompat">
+                      <object class="GtkCheckButton" id="chkHiCompat">
                         <property name="label" translatable="yes">High compatibility mode</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip" translatable="yes">Use the asynchronous SPU interface.</property>
+                        <property name="tooltip_text" translatable="yes">Use the asynchronous SPU interface.</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -228,15 +217,15 @@ Cubic</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="chkIRQWait">
+                      <object class="GtkCheckButton" id="chkIRQWait">
                         <property name="label" translatable="yes">SPU IRQ Wait</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip" translatable="yes">Wait for CPU; only useful for some games.</property>
+                        <property name="tooltip_text" translatable="yes">Wait for CPU; only useful for some games.</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -244,15 +233,15 @@ Cubic</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="chkDisStereo">
+                      <object class="GtkCheckButton" id="chkDisStereo">
                         <property name="label" translatable="yes">Single channel sound</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip" translatable="yes">Play only one channel for a performance boost.</property>
+                        <property name="tooltip_text" translatable="yes">Play only one channel for a performance boost.</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -260,62 +249,112 @@ Cubic</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="chkFreqResponse">
+                      <object class="GtkCheckButton" id="chkFreqResponse">
                         <property name="label" translatable="yes">Frequency Response - Output Filter</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">3</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label12">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Compatibility&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="type">label_item</property>
-              </packing>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkHButtonBox" id="hbuttonbox1">
+          <object class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
             <property name="spacing">12</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="btn_close">
+              <object class="GtkButton" id="btn_close">
                 <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">3</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+  <object class="GtkListStore" id="liststoreVolume">
+    <columns>
+      <!-- column-name Item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Low</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Medium</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Loud</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Loudest</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststoreReverb">
+    <columns>
+      <!-- column-name Item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Off</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Simple</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Playstation</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststoreInterpolation">
+    <columns>
+      <!-- column-name Item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Simple</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gaussian</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Cubic</col>
+      </row>
+    </data>
+  </object>
+</interface>
diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c
index fc5976cb..f8a85bb8 100644
--- a/plugins/dfsound/spucfg-0.1df/main.c
+++ b/plugins/dfsound/spucfg-0.1df/main.c
@@ -6,7 +6,6 @@
 #include <string.h>

 #include <sys/stat.h>

 

-#include <glade/glade.h>

 #include <gtk/gtk.h>

 

 #ifdef ENABLE_NLS

@@ -18,6 +17,9 @@
 #define WRITEBINARY "wb"

 #define CONFIG_FILENAME "dfsound.cfg"

 

+GtkBuilder *builder;

+GtkWidget *widget, *MainWindow;

+

 void SaveConfig(GtkWidget *widget, gpointer user_datal);

 

 /*	This function checks for the value being outside the accepted range,

@@ -45,16 +47,12 @@ void on_about_clicked (GtkWidget *widget, gpointer user_data)
 

 void OnConfigClose(GtkWidget *widget, gpointer user_data)

 {

-	GladeXML *xml = (GladeXML *)user_data;

-

-	gtk_widget_destroy(glade_xml_get_widget(xml, "CfgWnd"));

+	gtk_widget_destroy(gtk_builder_get_object(builder, "CfgWnd"));

 	gtk_exit(0);

 }

 

 int main(int argc, char *argv[])

 {

-    GtkWidget *widget;

-    GladeXML *xml;

     FILE *in;

     char t[256];

     int len, val = 0;

@@ -84,7 +82,7 @@ int main(int argc, char *argv[])
     if (strcmp(argv[1], "ABOUT") == 0) {

 		const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL};

 		widget = gtk_about_dialog_new ();

-		gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSX Sound Plugin");

+		gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSXR Sound Plugin");

 		gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.6");

 		gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors);

 		gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/");

@@ -98,11 +96,14 @@ int main(int argc, char *argv[])
 		return 0;

     }

 

-    xml = glade_xml_new(DATADIR "dfsound.glade2", "CfgWnd", NULL);

-    if (!xml) {

+	builder = gtk_builder_new();

+

+	if (!gtk_builder_add_from_file(builder, DATADIR "dfsound.ui", NULL)) {

 		g_warning("We could not load the interface!");

-		return 255;

-    }

+		return 0;

+	}

+	

+	MainWindow = gtk_builder_get_object(builder, "CfgWnd");

 

     strcpy(cfg, CONFIG_FILENAME);

 

@@ -129,7 +130,7 @@ int main(int argc, char *argv[])
 	    val = set_limit (p, len, -1, 4) + 1;

     } else val = 2;

 

-    gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "cbVolume2")), val);

+    gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "cbVolume2")), val);

 

     if (pB) {

 	strcpy(t, "\nUseInterpolation");

@@ -141,7 +142,7 @@ int main(int argc, char *argv[])
 	    val = set_limit (p, len, 0, 3);

     } else val = 2;

 

-    gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "cbInterpolation2")), val);

+    gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "cbInterpolation2")), val);

 

     if (pB) {

 		strcpy(t, "\nXAPitch");

@@ -153,7 +154,7 @@ int main(int argc, char *argv[])
 		val = set_limit (p, len, 0, 1);

     } else val = 0;

 

-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkXASpeed")), val);

+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkXASpeed")), val);

 

     if (pB) {

 		strcpy(t, "\nHighCompMode");

@@ -165,7 +166,7 @@ int main(int argc, char *argv[])
 		val = set_limit (p, len, 0, 1);

     } else val = 1;

 

-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkHiCompat")), val);

+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkHiCompat")), val);

 

     if (pB) {

 		strcpy(t, "\nSPUIRQWait");

@@ -178,7 +179,7 @@ int main(int argc, char *argv[])
 		val = set_limit (p, len, 0, 1);

     } else val = 1;

 

-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkIRQWait")), val);

+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkIRQWait")), val);

 

     if (pB) {

 		strcpy(t, "\nDisStereo");

@@ -191,7 +192,7 @@ int main(int argc, char *argv[])
 		val = set_limit (p, len, 0, 1);

     } else val = 0;

 

-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkDisStereo")), val);

+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkDisStereo")), val);

 

     if (pB) {

 		strcpy(t, "\nFreqResponse");

@@ -204,7 +205,7 @@ int main(int argc, char *argv[])
 		val = set_limit (p, len, 0, 1);

     } else val = 0;

 

-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkFreqResponse")), val);

+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkFreqResponse")), val);

 

 	if (pB) {

 		strcpy(t, "\nUseReverb");

@@ -216,18 +217,18 @@ int main(int argc, char *argv[])
 		val = set_limit (p, len, 0, 2);

     } else val = 2;

 

-    gtk_combo_box_set_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbReverb2")), val);

+    gtk_combo_box_set_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbReverb2")), val);

 

     if (pB)

 		free(pB);

 

-	widget = glade_xml_get_widget(xml, "CfgWnd");

+	widget = gtk_builder_get_object(builder, "CfgWnd");

 	g_signal_connect_data(GTK_OBJECT(widget), "destroy",

-		G_CALLBACK(SaveConfig), xml, NULL, 0);

+		G_CALLBACK(SaveConfig), builder, NULL, 0);

 

-	widget = glade_xml_get_widget(xml, "btn_close");

+	widget = gtk_builder_get_object(builder, "btn_close");

 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",

-		G_CALLBACK(OnConfigClose), xml, NULL, G_CONNECT_AFTER);

+		G_CALLBACK(OnConfigClose), builder, NULL, G_CONNECT_AFTER);

 

     gtk_main();

     return 0;

@@ -235,7 +236,6 @@ int main(int argc, char *argv[])
 

 void SaveConfig(GtkWidget *widget, gpointer user_data)

 {

-	GladeXML *xml = (GladeXML *)user_data;

 	FILE *fp;

 	int val;

 

@@ -245,28 +245,28 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
 		gtk_exit(0);

 	}

 

-	val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbVolume2")));

+	val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbVolume2")));

 	fprintf(fp, "\nVolume = %d\n", val - 1);

 

-	val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbInterpolation2")));

+	val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbInterpolation2")));

 	fprintf(fp, "\nUseInterpolation = %d\n", val);

 

-	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkXASpeed")));

+	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkXASpeed")));

 	fprintf(fp, "\nXAPitch = %d\n", val);

 

-	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkHiCompat")));

+	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkHiCompat")));

 	fprintf(fp, "\nHighCompMode = %d\n", val);

 

-	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkIRQWait")));

+	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkIRQWait")));

 	fprintf(fp, "\nSPUIRQWait = %d\n", val);

 

-	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkDisStereo")));

+	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkDisStereo")));

 	fprintf(fp, "\nDisStereo = %d\n", val);

 

-	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkFreqResponse")));

+	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkFreqResponse")));

 	fprintf(fp, "\nFreqResponse = %d\n", val);

 

-	val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbReverb2")));

+	val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbReverb2")));

 	fprintf(fp, "\nUseReverb = %d\n", val);

 

 	fclose(fp);