summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Yves Avenard <jyavenard@mythtv.org>2011-09-29 05:52:44 (GMT)
committer Jean-Yves Avenard <jyavenard@mythtv.org>2011-09-29 05:52:44 (GMT)
commit551057947363159f766a686d5ac5cdcce525f68b (patch)
tree2e6ca59db0fe7ae497d99abe744400a815e54ba5
parentd7e974efdccc3e102a5b8241369f79d8f48b7ca1 (diff)
Fix JACK/ALSA compilation
-rw-r--r--mythtv/libs/libmyth/audiooutput.cpp12
-rw-r--r--mythtv/libs/libmyth/libmyth.pro4
2 files changed, 8 insertions, 8 deletions
diff --git a/mythtv/libs/libmyth/audiooutput.cpp b/mythtv/libs/libmyth/audiooutput.cpp
index 12cebd5..0abe717 100644
--- a/mythtv/libs/libmyth/audiooutput.cpp
+++ b/mythtv/libs/libmyth/audiooutput.cpp
@@ -21,13 +21,13 @@ using namespace std;
#ifdef USING_OSS
#include "audiooutputoss.h"
#endif
-#ifdef USE_ALSA
+#ifdef USING_ALSA
#include "audiooutputalsa.h"
#endif
#if CONFIG_DARWIN
#include "audiooutputca.h"
#endif
-#ifdef USE_JACK
+#ifdef USING_JACK
#include "audiooutputjack.h"
#endif
#ifdef USING_PULSEOUTPUT
@@ -106,7 +106,7 @@ AudioOutput *AudioOutput::OpenAudio(AudioSettings &settings,
if (willsuspendpa)
{
bool ispulse = false;
-#ifdef USE_ALSA
+#ifdef USING_ALSA
// Check if using ALSA, that the device doesn't contain the word
// "pulse" in its hint
if (main_device.startsWith("ALSA:"))
@@ -140,7 +140,7 @@ AudioOutput *AudioOutput::OpenAudio(AudioSettings &settings,
if (main_device.startsWith("ALSA:"))
{
-#ifdef USE_ALSA
+#ifdef USING_ALSA
settings.TrimDeviceType();
ret = new AudioOutputALSA(settings);
#else
@@ -150,7 +150,7 @@ AudioOutput *AudioOutput::OpenAudio(AudioSettings &settings,
}
else if (main_device.startsWith("JACK:"))
{
-#ifdef USE_JACK
+#ifdef USING_JACK
settings.TrimDeviceType();
ret = new AudioOutputJACK(settings);
#else
@@ -328,7 +328,7 @@ AudioOutput::ADCVect* AudioOutput::GetOutputList(void)
bool pasuspended = PulseHandler::Suspend(PulseHandler::kPulseSuspend);
#endif
-#ifdef USE_ALSA
+#ifdef USING_ALSA
QMap<QString, QString> *alsadevs = AudioOutputALSA::GetALSADevices("pcm");
if (!alsadevs->empty())
diff --git a/mythtv/libs/libmyth/libmyth.pro b/mythtv/libs/libmyth/libmyth.pro
index fb4f5e6..143d513 100644
--- a/mythtv/libs/libmyth/libmyth.pro
+++ b/mythtv/libs/libmyth/libmyth.pro
@@ -196,13 +196,13 @@ freebsd {
INSTALLS += inc inc2
using_alsa {
- DEFINES += USE_ALSA
+ DEFINES += USING_ALSA
HEADERS += audiooutputalsa.h
SOURCES += audiooutputalsa.cpp
}
using_jack {
- DEFINES += USE_JACK
+ DEFINES += USING_JACK
HEADERS += audiooutputjack.h
SOURCES += audiooutputjack.cpp
}