ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
arcum42 2010-10-09 07:55:01 +00:00
parent bb137de2ef
commit e928cc14f6
5 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/spu2-x/src/Linux/Alsa.cpp
View File

@ -223,7 +223,7 @@ public:
const wchar_t* GetLongName() const
{
return L"Alsa ('tis all ya get)";
return L"Alsa";
}
void ReadSettings()

12
plugins/spu2-x/src/Linux/Config.cpp
View File

@ -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));

24
plugins/spu2-x/src/Linux/SPU2-X.cbp
View File

@ -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" />

3
plugins/spu2-x/src/SndOut.cpp
View File

@ -89,6 +89,9 @@ SndOutModule* mods[]=
WaveOut,
#endif
PortaudioOut,
#ifdef __LINUX__
AlsaOut,
#endif
NULL // signals the end of our list
};

3
plugins/spu2-x/src/SndOut.h
View File

@ -489,6 +489,9 @@ extern SndOutModule* DSoundOut;
extern SndOutModule* XAudio2Out;
#endif
extern SndOutModule* PortaudioOut;
#ifdef __LINUX__
extern SndOutModule* AlsaOut;
#endif
extern SndOutModule* mods[];