From e928cc14f63281333597308490f8fc64a7b82562 Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sat, 9 Oct 2010 07:55:01 +0000
Subject: [PATCH] spu2-x: Work a bit on the way multiple sound modules are
 handled in Linux.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3906 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/spu2-x/src/Linux/Alsa.cpp   |  2 +-
 plugins/spu2-x/src/Linux/Config.cpp | 12 ++++--------
 plugins/spu2-x/src/Linux/SPU2-X.cbp | 24 ------------------------
 plugins/spu2-x/src/SndOut.cpp       |  3 +++
 plugins/spu2-x/src/SndOut.h         |  3 +++
 5 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/plugins/spu2-x/src/Linux/Alsa.cpp b/plugins/spu2-x/src/Linux/Alsa.cpp
index 9bf0ff1de5..67c7bfde2b 100644
--- a/plugins/spu2-x/src/Linux/Alsa.cpp
+++ b/plugins/spu2-x/src/Linux/Alsa.cpp
@@ -223,7 +223,7 @@ public:
 
 	const wchar_t* GetLongName() const
 	{
-		return L"Alsa ('tis all ya get)";
+		return L"Alsa";
 	}
 
 	void ReadSettings()
diff --git a/plugins/spu2-x/src/Linux/Config.cpp b/plugins/spu2-x/src/Linux/Config.cpp
index cfebfbe90e..08d64505f0 100644
--- a/plugins/spu2-x/src/Linux/Config.cpp
+++ b/plugins/spu2-x/src/Linux/Config.cpp
@@ -175,10 +175,8 @@ void DisplayDialog()
     mod_box = gtk_combo_box_new_text ();
     gtk_combo_box_append_text(GTK_COMBO_BOX(mod_box), "0 - No Sound (emulate SPU2 only)");
     gtk_combo_box_append_text(GTK_COMBO_BOX(mod_box), "1 - PortAudio (cross-platform)");
-    if (OutputModule == 0)
-		gtk_combo_box_set_active(GTK_COMBO_BOX(mod_box), 0);
-	else
-		gtk_combo_box_set_active(GTK_COMBO_BOX(mod_box), 1);
+    //gtk_combo_box_append_text(GTK_COMBO_BOX(mod_box), "2 - Alsa (probably doesn't work)");
+    gtk_combo_box_set_active(GTK_COMBO_BOX(mod_box), OutputModule);
 
     latency_label = gtk_label_new ("Latency:");
     latency_slide = gtk_hscale_new_with_range(LATENCY_MIN, LATENCY_MAX, 5);
@@ -246,10 +244,8 @@ void DisplayDialog()
     	if (gtk_combo_box_get_active(GTK_COMBO_BOX(reverb_box)) != -1)
 			ReverbBoost = gtk_combo_box_get_active(GTK_COMBO_BOX(reverb_box));
 
-    	if (gtk_combo_box_get_active(GTK_COMBO_BOX(mod_box)) != 1)
-			OutputModule = 0;
-		else
-			OutputModule = FindOutputModuleById( PortaudioOut->GetIdent() );
+    	if (gtk_combo_box_get_active(GTK_COMBO_BOX(mod_box)) != -1)
+			OutputModule = gtk_combo_box_get_active(GTK_COMBO_BOX(mod_box));
 
     	SndOutLatencyMS = gtk_range_get_value(GTK_RANGE(latency_slide));
     	
diff --git a/plugins/spu2-x/src/Linux/SPU2-X.cbp b/plugins/spu2-x/src/Linux/SPU2-X.cbp
index 29a5912bf7..4ef2735763 100644
--- a/plugins/spu2-x/src/Linux/SPU2-X.cbp
+++ b/plugins/spu2-x/src/Linux/SPU2-X.cbp
@@ -68,30 +68,6 @@
 			<Add library="stdc++" />
 			<Add library="portaudio" />
 		</Linker>
-		<Unit filename="../3rdparty/liba52/a52.h" />
-		<Unit filename="../3rdparty/liba52/a52_internal.h" />
-		<Unit filename="../3rdparty/liba52/attributes.h" />
-		<Unit filename="../3rdparty/liba52/bit_allocate.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../3rdparty/liba52/bitstream.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../3rdparty/liba52/bitstream.h" />
-		<Unit filename="../3rdparty/liba52/config.h" />
-		<Unit filename="../3rdparty/liba52/downmix.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../3rdparty/liba52/imdct.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../3rdparty/liba52/inttypes.h" />
-		<Unit filename="../3rdparty/liba52/mm_accel.h" />
-		<Unit filename="../3rdparty/liba52/parse.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../3rdparty/liba52/tables.h" />
-		<Unit filename="../3rdparty/liba52/tendra.h" />
 		<Unit filename="../ADSR.cpp" />
 		<Unit filename="../Config.h" />
 		<Unit filename="../DPLII.h" />
diff --git a/plugins/spu2-x/src/SndOut.cpp b/plugins/spu2-x/src/SndOut.cpp
index 0eef712446..edf2d71f01 100644
--- a/plugins/spu2-x/src/SndOut.cpp
+++ b/plugins/spu2-x/src/SndOut.cpp
@@ -89,6 +89,9 @@ SndOutModule* mods[]=
 	WaveOut,
 #endif
 	PortaudioOut,
+#ifdef __LINUX__
+	AlsaOut,
+#endif
 	NULL		// signals the end of our list
 };
 
diff --git a/plugins/spu2-x/src/SndOut.h b/plugins/spu2-x/src/SndOut.h
index 9ba9f9e9e4..9d863eb34d 100644
--- a/plugins/spu2-x/src/SndOut.h
+++ b/plugins/spu2-x/src/SndOut.h
@@ -489,6 +489,9 @@ extern SndOutModule* DSoundOut;
 extern SndOutModule* XAudio2Out;
 #endif
 extern SndOutModule* PortaudioOut;
+#ifdef __LINUX__
+extern SndOutModule* AlsaOut;
+#endif
 
 extern SndOutModule* mods[];