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

7 files changed, 17 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index b3e399d3..2a80753d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+October 3, 2009 Wei Mingzhi <weimingzhi@gmail.com>
+
+ * plugins/dfsound/spucfg-0.1df/dfsound.glade2: Removed the "Enable XA" option
+   as we already has such an option in the main emu.
+ * plugins/dfsound/spucfg-0.1df/main.c: Likewise.
+ * plugins/dfsound/cfg.c: Likewise.
+ * plugins/dfsound/spu.c: Likewise.
+ * plugins/dfsound/externals.h: Likewise.
+ * plugins/dfsound/psemu.c: Likewise.
+
 October 1, 2009 Wei Mingzhi <weimingzhi@gmail.com>
 
  * gui/Gtk2Gui.c: Disable the "Graphics/Sound/CD-ROM/Controller" menuitems
diff --git a/plugins/dfsound/cfg.c b/plugins/dfsound/cfg.c
index 6c3069e3..6f092e54 100644
--- a/plugins/dfsound/cfg.c
+++ b/plugins/dfsound/cfg.c
@@ -108,11 +108,6 @@ void ReadConfigFile(void)
  if(iVolume<1) iVolume=1;

  if(iVolume>4) iVolume=4;

 

- strcpy(t,"\nUseXA");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}

- if(p) iUseXA=atoi(p+len);

- if(iUseXA<0) iUseXA=0;

- if(iUseXA>1) iUseXA=1;

-

  strcpy(t,"\nXAPitch");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}

  if(p) iXAPitch=atoi(p+len);

  if(iXAPitch<0) iXAPitch=0;

@@ -155,7 +150,6 @@ void ReadConfigFile(void)
 void ReadConfig(void)

 {

  iVolume=3;

- iUseXA=1; 

  iXAPitch=0;

  iSPUIRQWait=1;

  iUseTimer=2;

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 16a7b9c1..f8562046 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -15,7 +15,7 @@
  *                                                                         *

  ***************************************************************************/

 

-#include <stdint.h>
+#include <stdint.h>

 

 /////////////////////////////////////////////////////////

 // generic defines

@@ -209,7 +209,6 @@ extern unsigned char * pSpuBuffer;
 

 // user settings

 

-extern int        iUseXA;

 extern int        iVolume;

 extern int        iXAPitch;

 extern int        iUseTimer;

@@ -256,15 +255,15 @@ extern xa_decode_t   * xapGlobal;
 extern uint32_t * XAFeed;

 extern uint32_t * XAPlay;

 extern uint32_t * XAStart;

-extern uint32_t * XAEnd;
+extern uint32_t * XAEnd;

 

 extern uint32_t   XARepeat;

-extern uint32_t   XALastVal;
+extern uint32_t   XALastVal;

 

-extern uint32_t * CDDAFeed;
-extern uint32_t * CDDAPlay;
-extern uint32_t * CDDAStart;
-extern uint32_t * CDDAEnd;
+extern uint32_t * CDDAFeed;

+extern uint32_t * CDDAPlay;

+extern uint32_t * CDDAStart;

+extern uint32_t * CDDAEnd;

 

 extern int           iLeftXAVol;

 extern int           iRightXAVol;

diff --git a/plugins/dfsound/psemu.c b/plugins/dfsound/psemu.c
index 2aeac7ed..c75a022c 100644
--- a/plugins/dfsound/psemu.c
+++ b/plugins/dfsound/psemu.c
@@ -94,6 +94,5 @@ void CALLBACK SPUstopChannels2(unsigned short channels)
 

 void CALLBACK SPUplaySector(unsigned long mode, unsigned char * p)

 {

- if(!iUseXA) return;                                    // no XA? bye

 }

 

diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index 700af07d..c1061da1 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -58,7 +58,6 @@ unsigned char * pMixIrq=0;
 
 // user settings
 
-int             iUseXA=1;
 int             iVolume=3;
 int             iXAPitch=1;
 int             iUseTimer=2;
@@ -790,7 +789,6 @@ void CALLBACK SPUupdate(void)
 
 void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap)
 {
- if(!iUseXA)    return;                                // no XA? bye
  if(!xap)       return;
  if(!xap->freq) return;                                // no xa freq ? bye
 
@@ -913,7 +911,6 @@ long SPUopen(void)
 {
  if (bSPUIsOpen) return 0;                              // security for some stupid main emus
 
- iUseXA = 1;                                            // just small setup
  iVolume = 3;
  iReverbOff = -1;
  spuIrq = 0;
diff --git a/plugins/dfsound/spucfg-0.1df/dfsound.glade2 b/plugins/dfsound/spucfg-0.1df/dfsound.glade2
index 577962c9..bc834599 100644
--- a/plugins/dfsound/spucfg-0.1df/dfsound.glade2
+++ b/plugins/dfsound/spucfg-0.1df/dfsound.glade2
@@ -259,26 +259,6 @@ Cubic</property>
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkCheckButton" id="chkEnableXA">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Enable or disable XA music.</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Enable XA</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
 		    <widget class="GtkCheckButton" id="chkXASpeed">
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Choose this if XA music is played too quickly.</property>
diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c
index 51d27254..66ba0936 100644
--- a/plugins/dfsound/spucfg-0.1df/main.c
+++ b/plugins/dfsound/spucfg-0.1df/main.c
@@ -160,18 +160,6 @@ int main(int argc, char *argv[])
     gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "cbInterpolation2")), val);
 
     if (pB) {
-	strcpy(t, "\nUseXA");
-	p = strstr(pB, t);
-	if (p) {
-	    p = strstr(p, "=");
-	    len = 1;
-	}
-		val = set_limit (p, len, 0, 1);
-    } else val = 1;
-
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkEnableXA")), val);
-
-    if (pB) {
 		strcpy(t, "\nXAPitch");
 		p = strstr(pB, t);
 		if (p) {
@@ -315,9 +303,6 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
     val = gtk_combo_box_get_active (GTK_COMBO_BOX (glade_xml_get_widget (xml, "cbInterpolation2")));
 	SetCfgVal(pB, "\nUseInterpolation", val);
 
-    val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "chkEnableXA")));
-	SetCfgVal(pB, "\nUseXA", val);
-
     val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "chkXASpeed")));
     SetCfgVal(pB, "\nXAPitch", val);