From 46ccee56b566bba3cf4730d9b231cb184b7ba098 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Mon, 21 Jan 2008 20:57:20 +0000
Subject: [PATCH] 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 | 6 ++++--
aegisub/audio_player_openal.cpp | 5 +++++
aegisub/audio_player_portaudio.cpp | 5 +++++
aegisub/audio_player_pulse.cpp | 6 ++++--
aegisub/win32/config0.h | 19 +++++++++++++++++++
build/aegisub_vs2005/aegisub_vs2005.vcproj | 18 +++++++++++++++++-
6 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/aegisub/audio_player_alsa.cpp b/aegisub/audio_player_alsa.cpp
index e3ae15768..20444a19e 100644
--- a/aegisub/audio_player_alsa.cpp
+++ b/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
diff --git a/aegisub/audio_player_openal.cpp b/aegisub/audio_player_openal.cpp
index 486854af1..26d50cb1e 100644
--- a/aegisub/audio_player_openal.cpp
+++ b/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
+
diff --git a/aegisub/audio_player_portaudio.cpp b/aegisub/audio_player_portaudio.cpp
index 47a06340c..877282ca4 100644
--- a/aegisub/audio_player_portaudio.cpp
+++ b/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
diff --git a/aegisub/audio_player_pulse.cpp b/aegisub/audio_player_pulse.cpp
index 9b4bcbd94..08e9a399e 100644
--- a/aegisub/audio_player_pulse.cpp
+++ b/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
diff --git a/aegisub/win32/config0.h b/aegisub/win32/config0.h
index 3776ff22b..0a5cd4968 100644
--- a/aegisub/win32/config0.h
+++ b/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
diff --git a/build/aegisub_vs2005/aegisub_vs2005.vcproj b/build/aegisub_vs2005/aegisub_vs2005.vcproj
index 4a10d6333..40495695d 100644
--- a/build/aegisub_vs2005/aegisub_vs2005.vcproj
+++ b/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"
>
--
GitLab