Make this all a bit more sane

src/core/commandlineoptions.cpp

@@ -62,13 +62,13 @@ CommandlineOptions::CommandlineOptions(int argc, char** argv)
     play_track_at_(-1),
     show_osd_(false),
 #ifdef HAVE_GSTREAMER
-    engine_(Engine::gstreamer)
+    engine_(Engine::Type_GStreamer)
 #elif defined(HAVE_LIBVLC)
-    engine_(Engine::vlc)
+    engine_(Engine::Type_VLC)
 #elif defined(HAVE_LIBXINE)
-    engine_(Engine::xine)
+    engine_(Engine::Type_Xine)
 #elif defined(HAVE_QT_PHONON)
-    engine_(Engine::qt_phonon)
+    engine_(Engine::Type_QtPhonon)
 #endif
 {
 }
@@ -173,27 +173,24 @@ bool CommandlineOptions::Parse() {
           ok = true;
           QString engine = optarg;
           if(engine == "gst")
-            engine_ = Engine::gstreamer;
+            engine_ = Engine::Type_GStreamer;
           else if(engine == "vlc")
-            engine_ = Engine::vlc;
+            engine_ = Engine::Type_VLC;
           else if(engine == "xine")
-            engine_ = Engine::xine;
+            engine_ = Engine::Type_Xine;
           else if(engine == "qt-phonon")
-            engine_ = Engine::qt_phonon;
+            engine_ = Engine::Type_QtPhonon;
           else
           {
             qFatal("%s%s",
                 tr("Unknown audio engine \"%1\". Choices are:").arg(engine).toAscii().data(),
-#ifdef HAVE_GSTREAMER
+#if defined(HAVE_GSTREAMER)
                 " gst"
-#endif
-#ifdef HAVE_LIBVLC
+#elif defined(HAVE_LIBVLC)
                 " vlc"
-#endif
-#ifdef HAVE_LIBXINE
+#elif defined(HAVE_LIBXINE)
                 " xine"
-#endif
-#ifdef HAVE_QT_PHONON
+#elif defined(HAVE_QT_PHONON)
                 " qt-phonon"
 #endif
             );

src/core/player.cpp

@@ -22,16 +22,13 @@
 #include "playlist/playlistmanager.h"
 #include "radio/lastfmservice.h"
 
-#ifdef HAVE_GSTREAMER
+#if defined(HAVE_GSTREAMER)
 #  include "engines/gstengine.h"
-#endif
-#ifdef HAVE_LIBVLC
+#elif defined(HAVE_LIBVLC)
 #  include "engines/vlcengine.h"
-#endif
-#ifdef HAVE_LIBXINE
+#elif defined(HAVE_LIBXINE)
 #  include "engines/xine-engine.h"
-#endif
-#ifdef HAVE_QT_PHONON
+#elif defined(HAVE_QT_PHONON)
 #  include "engines/phononengine.h"
 #endif
 
@@ -100,23 +97,20 @@ Player::~Player() {
 
 EngineBase* Player::CreateEngine(Engine::Type engine) {
   switch(engine) {
-#ifdef HAVE_GSTREAMER
-    case Engine::gstreamer:
+#if defined(HAVE_GSTREAMER)
+    case Engine::Type_GStreamer:
       return new GstEngine();
       break;
-#endif
-#ifdef HAVE_LIBVLC
-    case Engine::vlc:
+#elif defined(HAVE_LIBVLC)
+    case Engine::Type_VLC:
       return new VlcEngine();
       break;
-#endif
-#ifdef HAVE_LIBXINE
-    case Engine::xine:
+#elif defined(HAVE_LIBXINE)
+    case Engine::Type_Xine:
       return new XineEngine();
       break;
-#endif
-#ifdef HAVE_QT_PHONON
-    case Engine::qt_phonon:
+#elif defined(HAVE_QT_PHONON)
+    case Engine::Type_QtPhonon:
       return new PhononEngine();
       break;
 #endif

src/engines/engine_fwd.h

@@ -10,7 +10,12 @@ namespace Engine
     struct SimpleMetaBundle;
     class Base;
 
-    enum Type { gstreamer, vlc, xine, qt_phonon };
+    enum Type {
+      Type_GStreamer,
+      Type_VLC,
+      Type_Xine,
+      Type_QtPhonon,
+    };
 
     /**
      * You should return: