From 3dad151608e0546334318e1bf703ad1bcd11073c Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Mon, 31 May 2010 21:24:54 +0000
Subject: [PATCH] Undo part of r1004, thanks John

---
 src/core/commandlineoptions.cpp | 11 +++++++----
 src/core/player.cpp             | 22 ++++++++++++++--------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/core/commandlineoptions.cpp b/src/core/commandlineoptions.cpp
index 2cef954a3..9e1cb51a2 100644
--- a/src/core/commandlineoptions.cpp
+++ b/src/core/commandlineoptions.cpp
@@ -184,13 +184,16 @@ bool CommandlineOptions::Parse() {
           {
             qFatal("%s%s",
                 tr("Unknown audio engine \"%1\". Choices are:").arg(engine).toAscii().data(),
-#if defined(HAVE_GSTREAMER)
+#ifdef HAVE_GSTREAMER
                 " gst"
-#elif defined(HAVE_LIBVLC)
+#endif
+#ifdef HAVE_LIBVLC
                 " vlc"
-#elif defined(HAVE_LIBXINE)
+#endif
+#ifdef HAVE_LIBXINE
                 " xine"
-#elif defined(HAVE_QT_PHONON)
+#endif
+#ifdef HAVE_QT_PHONON
                 " qt-phonon"
 #endif
             );
diff --git a/src/core/player.cpp b/src/core/player.cpp
index 3bfe84cec..d92b5d045 100644
--- a/src/core/player.cpp
+++ b/src/core/player.cpp
@@ -22,13 +22,16 @@
 #include "playlist/playlistmanager.h"
 #include "radio/lastfmservice.h"
 
-#if defined(HAVE_GSTREAMER)
+#ifdef HAVE_GSTREAMER
 #  include "engines/gstengine.h"
-#elif defined(HAVE_LIBVLC)
+#endif
+#ifdef HAVE_LIBVLC
 #  include "engines/vlcengine.h"
-#elif defined(HAVE_LIBXINE)
+#endif
+#ifdef HAVE_LIBXINE
 #  include "engines/xine-engine.h"
-#elif defined(HAVE_QT_PHONON)
+#endif
+#ifdef HAVE_QT_PHONON
 #  include "engines/phononengine.h"
 #endif
 
@@ -97,19 +100,22 @@ Player::~Player() {
 
 EngineBase* Player::CreateEngine(Engine::Type engine) {
   switch(engine) {
-#if defined(HAVE_GSTREAMER)
+#ifdef HAVE_GSTREAMER
     case Engine::Type_GStreamer:
       return new GstEngine();
       break;
-#elif defined(HAVE_LIBVLC)
+#endif
+#ifdef HAVE_LIBVLC
     case Engine::Type_VLC:
       return new VlcEngine();
       break;
-#elif defined(HAVE_LIBXINE)
+#endif
+#ifdef HAVE_LIBXINE
     case Engine::Type_Xine:
       return new XineEngine();
       break;
-#elif defined(HAVE_QT_PHONON)
+#endif
+#ifdef HAVE_QT_PHONON
     case Engine::Type_QtPhonon:
       return new PhononEngine();
       break;