Rebranding.

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

20 files changed, 376 insertions, 299 deletions

diff --git a/plugins/bladesio1/Makefile.am b/plugins/bladesio1/Makefile.am
index f6d4e5a3..0a51c332 100644
--- a/plugins/bladesio1/Makefile.am
+++ b/plugins/bladesio1/Makefile.am
@@ -3,7 +3,7 @@ libdir = @libdir@/games/psemu/
 
 lib_LTLIBRARIES = libBladeSio1.la
 
-libBladeSio1_la_SOURCES = sio1.c settings.c
+libBladeSio1_la_SOURCES = sio1.c sio1.h settings.c settings.h
 libBladeSio1_la_LDFLAGS = -module -avoid-version
 
 AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am
index 387a3544..b001ab0f 100644
--- a/plugins/dfcdrom/Makefile.am
+++ b/plugins/dfcdrom/Makefile.am
@@ -23,13 +23,13 @@ endif
 
 AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+	$(GTK2_CFLAGS) \
 	-I../../libpcsxcore -I../../include
 
 bin_PROGRAMS = cfgDFCdrom
 cfgDFCdrom_SOURCES = cdrcfg-0.1df/main.c
-cfgDFCdrom_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
+cfgDFCdrom_LDADD = $(GTK2_LIBS)
 
-glade_DATA = cdrcfg-0.1df/dfcdrom.glade2
+glade_DATA = cdrcfg-0.1df/dfcdrom.ui
 gladedir = $(datadir)/psemu/
 EXTRA_DIST = $(glade_DATA)
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui
index 25610e2e..c16dfd17 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2
+++ b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui
@@ -1,76 +1,66 @@
 <?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.6 -->
+<interface>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkDialog" id="CfgWnd">
+  <object class="GtkDialog" id="CfgWnd">
     <property name="visible">True</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">CDR configuration</property>
     <property name="modal">True</property>
     <property name="window_position">center</property>
     <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
     <signal name="show" handler="on_cfg_dialog_show"/>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
-          <widget class="GtkVBox" id="vbox1">
+          <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
             <property name="orientation">vertical</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="GtkHBox" id="hbox5">
+                  <object class="GtkHBox" id="hbox5">
                     <property name="visible">True</property>
                     <property name="border_width">10</property>
                     <child>
-                      <widget class="GtkComboBoxEntry" id="cddev_comboboxentry">
+                      <object class="GtkComboBoxEntry" id="cddev_comboboxentry">
                         <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Choose your CD-ROM device or type its path if it's not listed</property>
-                      </widget>
+                        <property name="tooltip_text" translatable="yes">Choose your CD-ROM device or type its path if it's not listed</property>
+                      </object>
                       <packing>
                         <property name="position">0</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="cdr_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Select CD-ROM device</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="GtkVBox" id="vbox2">
+                  <object class="GtkVBox" id="vbox2">
                     <property name="visible">True</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox1">
+                      <object class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <child>
-                          <widget class="GtkLabel" id="readmode_label">
+                          <object class="GtkLabel" id="readmode_label">
                             <property name="visible">True</property>
                             <property name="xpad">5</property>
                             <property name="ypad">5</property>
                             <property name="label" translatable="yes">Select read mode:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -78,16 +68,21 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkComboBox" id="readmode_combobox">
+                          <object class="GtkComboBox" id="readmode_combobox">
                             <property name="visible">True</property>
-                            <property name="items" translatable="yes">Normal (No Cache)
-Threaded - Faster (With Cache)</property>
-                          </widget>
+                            <property name="model">liststoreReadMode</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="cellrenderertextReadMode"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                           <packing>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -95,24 +90,24 @@ Threaded - Faster (With Cache)</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHSeparator" id="hseparator1">
+                      <object class="GtkHSeparator" id="hseparator1">
                         <property name="visible">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHBox" id="hbox2">
+                      <object class="GtkHBox" id="hbox2">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <property name="spacing">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label4">
+                          <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Cache Size (Def. 64):</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -120,13 +115,12 @@ Threaded - Faster (With Cache)</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkSpinButton" id="spinCacheSize">
+                          <object class="GtkSpinButton" id="spinCacheSize">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">32 32 2048 1 16 0</property>
                             <property name="climb_rate">1</property>
                             <property name="numeric">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -134,30 +128,30 @@ Threaded - Faster (With Cache)</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHSeparator" id="hseparator2">
+                      <object class="GtkHSeparator" id="hseparator2">
                         <property name="visible">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHBox" id="hbox4">
+                      <object class="GtkHBox" id="hbox4">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <property name="spacing">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label7">
+                          <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Spindown Time:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -165,25 +159,16 @@ Threaded - Faster (With Cache)</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkComboBox" id="comboSpinDown">
+                          <object class="GtkComboBox" id="comboSpinDown">
                             <property name="visible">True</property>
-                            <property name="items" translatable="yes">Default
-125ms
-250ms
-500ms
-1s
-2s
-4s
-8s
-16s
-32s
-1min
-2min
-4min
-8min
-16min
-32min</property>
-                          </widget>
+                            <property name="model">liststoreSpindownTime</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="cellrenderertextSpindownTime"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -191,30 +176,30 @@ Threaded - Faster (With Cache)</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHSeparator" id="hseparator3">
+                      <object class="GtkHSeparator" id="hseparator3">
                         <property name="visible">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHBox" id="hbox3">
+                      <object class="GtkHBox" id="hbox3">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <property name="spacing">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label5">
+                          <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Cdrom Speed (Def. 0 = MAX):</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -222,13 +207,12 @@ Threaded - Faster (With Cache)</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkSpinButton" id="spinCdrSpeed">
+                          <object class="GtkSpinButton" id="spinCdrSpeed">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">0 0 100 1 4 0</property>
                             <property name="climb_rate">1</property>
                             <property name="numeric">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -236,25 +220,22 @@ Threaded - Faster (With Cache)</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">6</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHSeparator" id="cfg_hseparator">
+                      <object class="GtkHSeparator" id="cfg_hseparator">
                         <property name="visible">True</property>
-                        <accessibility>
-                          <atkproperty name="AtkObject::accessible-name" translatable="yes">hseparator</atkproperty>
-                        </accessibility>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">7</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="subQ_button">
+                      <object class="GtkCheckButton" id="subQ_button">
                         <property name="label" translatable="yes">Enable subchannel read</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -262,63 +243,126 @@ Threaded - Faster (With Cache)</property>
                         <property name="border_width">10</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">8</property>
                       </packing>
                     </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="options_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Options</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="cfg_dialog-action_area">
+          <object class="GtkHButtonBox" id="cfg_dialog-action_area">
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="cfg_closebutton">
+              <object class="GtkButton" id="cfg_closebutton">
                 <property name="label">gtk-close</property>
-                <property name="response_id">-6</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>
                 <signal name="clicked" handler="on_cfg_cancelbutton_clicked"/>
-              </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="expand">False</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="-6">cfg_closebutton</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkListStore" id="liststoreReadMode">
+    <columns>
+      <!-- column-name Item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Normal (No Cache)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Threaded - Faster (With Cache)</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststoreSpindownTime">
+    <columns>
+      <!-- column-name Item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Default</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">125ms</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">250ms</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">500ms</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">1s</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">2s</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">4s</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">8s</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">16s</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">32s</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">1min</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">2min</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">4min</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">8min</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">16min</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">32min</col>
+      </row>
+    </data>
+  </object>
+</interface>
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c
index fbbe29d5..0b62a801 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/main.c
+++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c
@@ -22,9 +22,9 @@
 #include "../cfg.c"

 

 #include <gtk/gtk.h>

-#include <glade/glade.h>

 

-GtkWidget *MainWindow;

+GtkBuilder *builder;

+GtkWidget *widget, *MainWindow;

 

 // function to check if the device is a cdrom

 int is_cdrom(const char *device) {

@@ -174,27 +174,23 @@ void fill_drives_list(GtkWidget *widget) {
 }

 

 static void OnConfigExit(GtkWidget *widget, gpointer user_data) {

-	GladeXML *xml;

-

-	xml = glade_get_widget_tree(MainWindow);

-

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

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

 	strncpy(CdromDev, gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget)))), 255);

 	CdromDev[255] = '\0';

 

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

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

 	ReadMode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));

 

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

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

 	UseSubQ = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));

 

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

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

 	CacheSize = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));

 

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

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

 	CdrSpeed = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));

 

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

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

 	SpinDown = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));

 

 	SaveConf();

@@ -204,45 +200,36 @@ static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
 }

 

 long CDRconfigure() {

-	GladeXML *xml;

-	GtkWidget *widget;

-

 	LoadConf();

 

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

-	if (xml == NULL) {

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

-		return -1;

-	}

-

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

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

 	gtk_window_set_title(GTK_WINDOW(MainWindow), _("CDR configuration"));

 

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

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

 	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",

 		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);

 

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

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

 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",

 		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);

 

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

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

 	fill_drives_list(widget);

 	gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget))), CdromDev);

 

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

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

 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget), ReadMode);

 

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

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

 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), UseSubQ);

 

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

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

 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (float)CacheSize);

 

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

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

 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (float)CdrSpeed);

 

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

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

 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget), SpinDown);

 

 	gtk_widget_show(MainWindow);

@@ -279,8 +266,15 @@ int main(int argc, char *argv[]) {
 	gtk_init(&argc, &argv);

 

 	if (argc != 2) return 0;

-

+	

 	if (strcmp(argv[1], "configure") == 0) {

+		builder = gtk_builder_new();

+		

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

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

+			return 0;

+		}

+		

 		CDRconfigure();

 	} else {

 		CDRabout();

diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am
index c9ea709d..cceed304 100644
--- a/plugins/dfinput/Makefile.am
+++ b/plugins/dfinput/Makefile.am
@@ -3,7 +3,7 @@ libdir = @libdir@/games/psemu/
 
 lib_LTLIBRARIES = libDFInput.la
 
-libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c util.c
+libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c util.c util.h
 libDFInput_la_LDFLAGS = -module -avoid-version 
 libDFInput_la_LIBADD = -lpthread -lX11 $(SDL_LIBS)
 
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index fcb86b5e..501ba008 100644
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -578,7 +578,7 @@ static long PADreadPort(int num, PadDataS *pad) {
 

 	pad->buttonStatus = (g.PadState[num].KeyStatus & g.PadState[num].JoyKeyStatus);

 

-	// ePSXe different from pcsx, swap bytes

+	// ePSXe different from pcsxr, swap bytes

 	pad->buttonStatus = (pad->buttonStatus >> 8) | (pad->buttonStatus << 8);

 

 	switch (g.cfg.PadDef[num].Type) {

diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am
index 4db81928..d67a106b 100644
--- a/plugins/dfnet/Makefile.am
+++ b/plugins/dfnet/Makefile.am
@@ -3,7 +3,7 @@ libdir = @libdir@/games/psemu/
 
 lib_LTLIBRARIES = libDFNet.la
 
-libDFNet_la_SOURCES = dfnet.c unix.c cfg.c
+libDFNet_la_SOURCES = dfnet.c dfnet.h unix.c cfg.c
 libDFNet_la_LDFLAGS = -module -avoid-version
 
 AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
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);

diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am
index a7515a21..7e56a9c6 100644
--- a/plugins/dfxvideo/Makefile.am
+++ b/plugins/dfxvideo/Makefile.am
@@ -17,9 +17,9 @@ libdir = @libdir@/games/psemu/
 
 lib_LTLIBRARIES = libDFXVideo.la
 
-libDFXVideo_la_SOURCES = gpu.c cfg.c draw.c fps.c key.c menu.c prim.c soft.c zn.c
+libDFXVideo_la_SOURCES = gpu.c gpu.h cfg.c cfg.h draw.c draw.h fps.c fps.h key.c key.h menu.c menu.h prim.c prim.h soft.c soft.h zn.c swap.h externals.h hq2x.h hq3x.h interp.h
 if X86_NASM
-libDFXVideo_la_SOURCES += i386.asm
+libDFXVideo_la_SOURCES += i386.asm macros.inc
 AM_CPPFLAGS += -DUSE_NASM=1
 endif
 libDFXVideo_la_LDFLAGS = -module -avoid-version
diff --git a/plugins/dfxvideo/cfg.c b/plugins/dfxvideo/cfg.c
index 70c08461..09d0485c 100644
--- a/plugins/dfxvideo/cfg.c
+++ b/plugins/dfxvideo/cfg.c
@@ -96,7 +96,7 @@ void ReadConfigFile()
     {

      strcpy(t,"cfg/dfxvideo.cfg");

      in = fopen(t,"rb");

-     if(!in) sprintf(t,"%s/.pcsx/plugins/dfxvideo.cfg",getenv("HOME"));

+     if(!in) sprintf(t,"%s/.pcsxr/plugins/dfxvideo.cfg",getenv("HOME"));

      else    fclose(in);

     }

    else     fclose(in);

@@ -188,7 +188,7 @@ void ExecCfg(char *arg) {
 		return;

 	}

 

-	sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgDFXVideo", getenv("HOME"));

+	sprintf(cfg, "%s/.pcsxr/plugins/cfg/cfgDFXVideo", getenv("HOME"));

 	if (stat(cfg, &buf) != -1) {

 		if (fork() == 0) {

 			execl(cfg, "cfgDFXVideo", arg, NULL);

@@ -256,7 +256,7 @@ void WriteConfig(void) {
     {

      strcpy(t,"cfg/dfxvideo.cfg");

      out = fopen(t,"rb");

-     if(!out) sprintf(t,"%s/.pcsx/plugins/dfxvideo.cfg",getenv("HOME"));

+     if(!out) sprintf(t,"%s/.pcsxr/plugins/dfxvideo.cfg",getenv("HOME"));

      else     fclose(out);

     }

    else     fclose(out);

diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c
index bd14f28f..ef06be1a 100644
--- a/plugins/dfxvideo/gpu.c
+++ b/plugins/dfxvideo/gpu.c
@@ -294,9 +294,9 @@ static void DoTextSnapShot(int iNum)
  char *pB;

 

 #ifdef _WINDOWS

- sprintf(szTxt,"snap\\pcsx%04d.txt",iNum);

+ sprintf(szTxt,"snap\\pcsxr%04d.txt",iNum);

 #else

- sprintf(szTxt,"%s/pcsx%04d.txt",getenv("HOME"),iNum);

+ sprintf(szTxt,"%s/pcsxr%04d.txt",getenv("HOME"),iNum);

 #endif

 

  if ((txtfile = fopen(szTxt, "wb")) == NULL)

@@ -356,9 +356,9 @@ void CALLBACK GPUmakeSnapshot(void)
   {

    snapshotnr++;

 #ifdef _WINDOWS

-   sprintf(filename,"snap\\pcsx%04ld.bmp",snapshotnr);

+   sprintf(filename,"snap\\pcsxr%04ld.bmp",snapshotnr);

 #else

-   sprintf(filename, "%s/pcsx%04ld.bmp", getenv("HOME"), snapshotnr);

+   sprintf(filename, "%s/pcsxr%04ld.bmp", getenv("HOME"), snapshotnr);

 #endif

 

    bmpfile = fopen(filename,"rb");

diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c
index 07d362e3..4edc0a25 100644
--- a/plugins/dfxvideo/gpucfg-0.1df/main.c
+++ b/plugins/dfxvideo/gpucfg-0.1df/main.c
@@ -144,7 +144,7 @@ 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), "P.E.Op.S PCSX Video Plugin");

+		gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSXR Video Plugin");

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

 		gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors);

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

@@ -178,7 +178,7 @@ main (int argc, char *argv[])
     fclose(in);

    }

   else{ pB=0;printf("Couldn't find config file %s\n", cfg);}

-/* ADB TODO Parse this like we parse the config file in PCSX - use common functions! */

+/* ADB TODO Parse this like we parse the config file in PCSXR - use common functions! */

   val=1;

   if(pB)

    {

diff --git a/plugins/gxvideo/Makefile.am b/plugins/gxvideo/Makefile.am
index 0f6499c1..9f753f91 100644
--- a/plugins/gxvideo/Makefile.am
+++ b/plugins/gxvideo/Makefile.am
@@ -16,15 +16,15 @@ bindir = @libdir@/games/psemu/
 libdir = @libdir@/games/psemu/
 
 noinst_LTLIBRARIES = libcfg.la libglobals.la
-libcfg_la_SOURCES = cfg.c
+libcfg_la_SOURCES = cfg.c cfg.h globals.h
 
 libglobals_la_SOURCES = globals.c
 
 lib_LTLIBRARIES = libGXVideo.la
 
-libGXVideo_la_SOURCES = gpu.c draw.c fps.c key.c menu.c prim.c soft.c
+libGXVideo_la_SOURCES = gpu.c gpu.h draw.c draw.h fps.c fps.h key.c key.h menu.c menu.h prim.c prim.h soft.c soft.h gpu_utils.h interp.h swap.h
 if X86_NASM
-libGXVideo_la_SOURCES += i386.asm
+libGXVideo_la_SOURCES += i386.asm macros.inc
 AM_CPPFLAGS += -DUSE_NASM=1
 endif
 libGXVideo_la_LDFLAGS = -module -avoid-version
diff --git a/plugins/gxvideo/cfg.c b/plugins/gxvideo/cfg.c
index 7b18327a..b64bd99d 100644
--- a/plugins/gxvideo/cfg.c
+++ b/plugins/gxvideo/cfg.c
@@ -78,7 +78,7 @@ void ReadConfigFile() {
 			strcpy(cfg_file_name, "cfg/" DEFAULT_CFG_NAME);

 			f_in = fopen(cfg_file_name, "rb");

 			if (!f_in)

-				snprintf(cfg_file_name, 255, "%s/.pcsx/plugins/" DEFAULT_CFG_NAME, getenv("HOME"));

+				snprintf(cfg_file_name, 255, "%s/.pcsxr/plugins/" DEFAULT_CFG_NAME, getenv("HOME"));

 			else

 				fclose(f_in);

 		} else

@@ -175,7 +175,7 @@ void ExecCfg(char const * arg) {
 		return;

 	}

 

-	sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgGXVideo", getenv("HOME"));

+	sprintf(cfg, "%s/.pcsxr/plugins/cfg/cfgGXVideo", getenv("HOME"));

 	if (stat(cfg, &buf) != -1) {

 		if (fork() == 0) {

 			execl(cfg, "cfgGXVideo", arg, NULL);

@@ -230,7 +230,7 @@ void WriteConfig(void) {
 			strcpy(cfg_file_name, "cfg/" DEFAULT_CFG_NAME);

 			f_out = fopen(cfg_file_name, "rb");

 			if (!f_out)

-				snprintf(cfg_file_name, 255, "%s/.pcsx/plugins/" DEFAULT_CFG_NAME, getenv("HOME"));

+				snprintf(cfg_file_name, 255, "%s/.pcsxr/plugins/" DEFAULT_CFG_NAME, getenv("HOME"));

 			else

 				fclose(f_out);

 		} else

diff --git a/plugins/gxvideo/gpu.c b/plugins/gxvideo/gpu.c
index 22544950..853c7da3 100644
--- a/plugins/gxvideo/gpu.c
+++ b/plugins/gxvideo/gpu.c
@@ -217,9 +217,9 @@ void CALLBACK GPUmakeSnapshot(void) {
 	//	do {

 	//		snapshotnr++;

 	//#ifdef _WINDOWS

-	//		sprintf(filename,"snap\\pcsx%04ld.bmp",snapshotnr);

+	//		sprintf(filename,"snap\\pcsxr%04ld.bmp",snapshotnr);

 	//#else

-	//		sprintf(filename, "%s/pcsx%04ld.bmp", getenv("HOME"), snapshotnr);

+	//		sprintf(filename, "%s/pcsxr%04ld.bmp", getenv("HOME"), snapshotnr);

 	//#endif

 	//

 	//		bmpfile = fopen(filename, "rb");

diff --git a/plugins/gxvideo/gpucfg/main.c b/plugins/gxvideo/gpucfg/main.c
index 64691e56..d3d4f93d 100644
--- a/plugins/gxvideo/gpucfg/main.c
+++ b/plugins/gxvideo/gpucfg/main.c
@@ -165,7 +165,7 @@ int main(int argc, char *argv[]) {
 				"Ryan Schultz", "Andrew Burton", NULL };

 		widget = gtk_about_dialog_new();

 		gtk_about_dialog_set_name(GTK_ABOUT_DIALOG (widget),

-				"P.E.Op.S PCSX Video Plugin");

+				"P.E.Op.S PCSXR Video Plugin");

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

 		gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG (widget), authors);

 		gtk_about_dialog_set_website(GTK_ABOUT_DIALOG (widget),

diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c
index 04710bcd..2527fe39 100644
--- a/plugins/peopsxgl/gpu.c
+++ b/plugins/peopsxgl/gpu.c
@@ -371,9 +371,9 @@ void DoTextSnapShot(int iNum)
  FILE *txtfile;char szTxt[256];char * pB;

 

 #ifdef _WINDOWS

- sprintf(szTxt,"snap\\pcsx%04d.txt",iNum);

+ sprintf(szTxt,"snap\\pcsxr%04d.txt",iNum);

 #else

- sprintf(szTxt,"%s/pcsx%04d.txt",getenv("HOME"),iNum);

+ sprintf(szTxt,"%s/pcsxr%04d.txt",getenv("HOME"),iNum);

 #endif

 

  if((txtfile=fopen(szTxt,"wb"))==NULL)

@@ -440,9 +440,9 @@ void DoSnapShot(void)
   {

    snapshotnr++;

 #ifdef _WINDOWS

-   sprintf(filename,"snap/pcsx%04d.bmp",snapshotnr);

+   sprintf(filename,"snap/pcsxr%04d.bmp",snapshotnr);

 #else

-   sprintf(filename,"%s/pcsx%04d.bmp",getenv("HOME"),snapshotnr);

+   sprintf(filename,"%s/pcsxr%04d.bmp",getenv("HOME"),snapshotnr);

 #endif

    bmpfile=fopen(filename,"rb");

    if(bmpfile==NULL)break;

@@ -2980,7 +2980,7 @@ void StartCfgTool(char *arg) // linux: start external cfg tool
 		return;

 	}

 

-	sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgpeopsxgl", getenv("HOME"));

+	sprintf(cfg, "%s/.pcsxr/plugins/cfg/cfgpeopsxgl", getenv("HOME"));

 	if (stat(cfg, &buf) != -1) {

 		if (fork() == 0) {

 			execl(cfg, "cfgpeopsxgl", arg, NULL);