Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Undo part of r1004, thanks John

Browse Source
This commit is contained in:
David Sansome 2010-05-31 21:24:54 +00:00
parent d760721f61
commit 3dad151608
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/commandlineoptions.cpp
View File

@ -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
);

22
src/core/player.cpp
View File

@ -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;