Permalink
Browse files

Fix JACK/ALSA compilation

  • Loading branch information...
1 parent d7e974e commit 551057947363159f766a686d5ac5cdcce525f68b @jyavenard jyavenard committed Sep 29, 2011
Showing with 8 additions and 8 deletions.
  1. +6 −6 mythtv/libs/libmyth/audiooutput.cpp
  2. +2 −2 mythtv/libs/libmyth/libmyth.pro
@@ -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())
@@ -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
}

0 comments on commit 5510579

Please sign in to comment.