Move the audio engines to their own directory

src/CMakeLists.txt

@@ -11,7 +11,7 @@ set(CLEMENTINE-SOURCES
     librarybackend.cpp
     playlist.cpp
     playlistitem.cpp
-    enginebase.cpp
+    engines/enginebase.cpp
     analyzers/baranalyzer.cpp
     analyzers/analyzerbase.cpp
     fht.cpp
@@ -76,7 +76,7 @@ set(CLEMENTINE-MOC-HEADERS
     library.h
     librarybackend.h
     playlist.h
-    enginebase.h
+    engines/enginebase.h
     sliderwidget.h
     playlistview.h
     backgroundthread.h
@@ -195,11 +195,11 @@ file(APPEND ${CLEMENTINE-QM-RESOURCE} "</qresource></RCC>")
 
 # Audio engine - phonon on windows, xine elsewhere
 if(USE_PHONON)
-  set(CLEMENTINE-SOURCES ${CLEMENTINE-SOURCES} phononengine.cpp)
-  set(CLEMENTINE-MOC-HEADERS ${CLEMENTINE-MOC-HEADERS} phononengine.h)
+  set(CLEMENTINE-SOURCES ${CLEMENTINE-SOURCES} engines/phononengine.cpp)
+  set(CLEMENTINE-MOC-HEADERS ${CLEMENTINE-MOC-HEADERS} engines/phononengine.h)
 else(USE_PHONON)
-  set(CLEMENTINE-SOURCES ${CLEMENTINE-SOURCES} xine-engine.cpp xine-scope.c)
-  set(CLEMENTINE-MOC-HEADERS ${CLEMENTINE-MOC-HEADERS} xine-engine.h)
+  set(CLEMENTINE-SOURCES ${CLEMENTINE-SOURCES} engines/xine-engine.cpp engines/xine-scope.c)
+  set(CLEMENTINE-MOC-HEADERS ${CLEMENTINE-MOC-HEADERS} engines/xine-engine.h)
 endif(USE_PHONON)
 
 # OSD and DBus.

src/analyzers/analyzerbase.cpp

@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "analyzerbase.h"
-#include "enginebase.h"
+#include "engines/enginebase.h"
 #include <cmath>        //interpolate()
 #include <QEvent>     //event()
 #include <QPainter>

src/analyzers/analyzerbase.h

@@ -9,7 +9,7 @@
 #include <sys/types.h>
 #endif
 
-#include "engine_fwd.h"
+#include "engines/engine_fwd.h"
 #include "fht.h"     //stack allocated and convenience
 #include <QPixmap> //stack allocated and convenience
 #include <QTimer>  //stack allocated

src/analyzers/analyzercontainer.h

@@ -22,7 +22,7 @@
 #include <QSignalMapper>
 
 #include "analyzerbase.h"
-#include "engine_fwd.h"
+#include "engines/engine_fwd.h"
 
 class AnalyzerContainer : public QWidget {
   Q_OBJECT

src/library.h

@@ -24,7 +24,7 @@
 #include "librarybackend.h"
 #include "librarywatcher.h"
 #include "libraryquery.h"
-#include "engine_fwd.h"
+#include "engines/engine_fwd.h"
 #include "song.h"
 #include "libraryitem.h"
 #include "simpletreemodel.h"

src/librarywatcher.cpp

@@ -16,7 +16,7 @@
 
 #include "librarywatcher.h"
 #include "librarybackend.h"
-#include "enginebase.h"
+#include "engines/enginebase.h"
 
 #include <QFileSystemWatcher>
 #include <QDirIterator>

src/librarywatcher.h

@@ -19,7 +19,7 @@
 
 #include "directory.h"
 #include "song.h"
-#include "engine_fwd.h"
+#include "engines/engine_fwd.h"
 
 #include <QObject>
 #include <QStringList>

src/mainwindow.cpp

@@ -22,7 +22,7 @@
 #include "songplaylistitem.h"
 #include "systemtrayicon.h"
 #include "radiomodel.h"
-#include "enginebase.h"
+#include "engines/enginebase.h"
 #include "lastfmservice.h"
 #include "osd.h"
 #include "trackslider.h"

src/osd.h

@@ -21,7 +21,7 @@
 #include <QObject>
 #include <QSystemTrayIcon>
 
-#include "engine_fwd.h"
+#include "engines/engine_fwd.h"
 #include "song.h"
 
 class OSDPretty;

src/player.cpp

@@ -25,9 +25,9 @@
 #endif
 
 #ifdef USE_PHONON
-#  include "phononengine.h"
+#  include "engines/phononengine.h"
 #else
-#  include "xine-engine.h"
+#  include "engines/xine-engine.h"
 #endif
 
 #include <QtDebug>

src/player.h

@@ -22,7 +22,7 @@
 #include <QFuture>
 #include <QFutureWatcher>
 
-#include "engine_fwd.h"
+#include "engines/engine_fwd.h"
 #include "playlistitem.h"
 #include "song.h"
 

src/settingsdialog.cpp

@@ -15,7 +15,7 @@
 */
 
 #include "settingsdialog.h"
-#include "enginebase.h"
+#include "engines/enginebase.h"
 #include "osd.h"
 #include "osdpretty.h"
 

src/song.cpp

@@ -50,7 +50,7 @@
 using boost::scoped_ptr;
 
 #include "trackslider.h"
-#include "enginebase.h"
+#include "engines/enginebase.h"
 #include "albumcoverloader.h"
 
 const char* Song::kColumnSpec =

src/song.h

@@ -25,7 +25,7 @@
 #include <QString>
 #include <QMetaType>
 
-#include "engine_fwd.h"
+#include "engines/engine_fwd.h"
 
 namespace lastfm {
   class Track;