Protect remaining audio players by #ifdef and add those to config0.h and vcproj.

Originally committed to SVN as r1807.

aegisub/audio_player_alsa.cpp

@@ -34,6 +34,9 @@
 //
 
 
+#ifdef WITH_ALSA
+
+
 ///////////
 // Headers
 #include <wx/wxprec.h>
@@ -450,5 +453,4 @@ void AlsaPlayer::async_write_handler(snd_async_handler_t *pcm_callback)
 }
 
 
-
+#endif // WITH_ALSA
-

aegisub/audio_player_openal.cpp

@@ -34,6 +34,9 @@
 //
 
 
+#ifdef WITH_OPENAL
+
+
 ///////////
 // Headers
 #include <wx/wxprec.h>
@@ -396,3 +399,5 @@ int64_t OpenALPlayer::GetCurrentPosition()
 }
 
 
+#endif // WITH_OPENAL
+

aegisub/audio_player_portaudio.cpp

@@ -34,6 +34,9 @@
 //
 
 
+#ifdef WITH_PORTAUDIO
+
+
 ///////////
 // Headers
 #include "audio_player.h"
@@ -274,3 +277,5 @@ void PortAudioPlayer::CloseStream() {
 	} catch (...) {}
 }
 
+
+#endif // WITH_PORTAUDIO

aegisub/audio_player_pulse.cpp

@@ -34,6 +34,9 @@
 //
 
 
+#ifdef WITH_PULSEAUDIO
+
+
 ///////////
 // Headers
 #include <wx/wxprec.h>
@@ -475,5 +478,4 @@ void PulseAudioPlayer::pa_stream_notify(pa_stream *p, PulseAudioPlayer *thread)
 }
 
 
-
+#endif // WITH_PULSEAUDIO
-

aegisub/win32/config0.h

@@ -124,3 +124,22 @@
 // Requires: Ruby 1.9
 //#define WITH_RUBY
 
+
+// Enable PortAudio audio player
+// Requires PortAudio release 18
+//#define WITH_PORTAUDIO
+
+
+// Enable ALSA audio player
+// Requires Linux and libasound
+//#define WITH_ALSA
+
+
+// Enable OpenAL audio player
+// Requires OpenAL development libraries and headers
+//#define WITH_OPENAL
+
+
+// Enable Pulse Audio audio player
+// Requires libpulse (and a *NIX compatible system and a running sound server to actually use)
+//#define WITH_PULSEAUDIO

build/aegisub_vs2005/aegisub_vs2005.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="aegisub_vs2005"
 	ProjectGUID="{65C67A5D-D31C-4DB6-965B-69AF7EFA4B5A}"
 	RootNamespace="aegisub_vs2005"
@@ -495,10 +495,26 @@
 				RelativePath="..\..\aegisub\audio_player.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\aegisub\audio_player_alsa.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\aegisub\audio_player_dsound.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\aegisub\audio_player_openal.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\aegisub\audio_player_portaudio.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\aegisub\audio_player_pulse.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\aegisub\audio_provider.cpp"
 				>