Merge branch 'subsonic'

Conflicts:
	data/data.qrc

data/data.qrc

@@ -1,6 +1,7 @@
 <RCC>
     <qresource prefix="/">
         <file>blank.ttf</file>
+        <file>clementine_remote_qr.png</file>
         <file>clementine-spotify-public.pem</file>
         <file>currenttrack_bar_left.png</file>
         <file>currenttrack_bar_mid.png</file>
@@ -296,6 +297,8 @@
         <file>providers/somafm.png</file>
         <file>providers/songkick.png</file>
         <file>providers/soundcloud.png</file>
+        <file>providers/subsonic-32.png</file>
+        <file>providers/subsonic.png</file>
         <file>providers/ubuntuone.png</file>
         <file>providers/wikipedia.png</file>
         <file>sample.mood</file>
@@ -337,6 +340,7 @@
         <file>schema/schema-40.sql</file>
         <file>schema/schema-41.sql</file>
         <file>schema/schema-42.sql</file>
+        <file>schema/schema-43.sql</file>
         <file>schema/schema-4.sql</file>
         <file>schema/schema-5.sql</file>
         <file>schema/schema-6.sql</file>
@@ -358,6 +362,5 @@
         <file>volumeslider-handle_glow.png</file>
         <file>volumeslider-handle.png</file>
         <file>volumeslider-inset.png</file>
-        <file>clementine_remote_qr.png</file>
     </qresource>
 </RCC>

data/schema/schema-43.sql

@@ -0,0 +1,48 @@
+CREATE TABLE subsonic_songs(
+  title TEXT,
+  album TEXT,
+  artist TEXT,
+  albumartist TEXT,
+  composer TEXT,
+  track INTEGER,
+  disc INTEGER,
+  bpm REAL,
+  year INTEGER,
+  genre TEXT,
+  comment TEXT,
+  compilation INTEGER,
+
+  length INTEGER,
+  bitrate INTEGER,
+  samplerate INTEGER,
+
+  directory INTEGER NOT NULL,
+  filename TEXT NOT NULL,
+  mtime INTEGER NOT NULL,
+  ctime INTEGER NOT NULL,
+  filesize INTEGER NOT NULL,
+  sampler INTEGER NOT NULL DEFAULT 0,
+  art_automatic TEXT,
+  art_manual TEXT,
+  filetype INTEGER NOT NULL DEFAULT 0,
+  playcount INTEGER NOT NULL DEFAULT 0,
+  lastplayed INTEGER,
+  rating INTEGER,
+  forced_compilation_on INTEGER NOT NULL DEFAULT 0,
+  forced_compilation_off INTEGER NOT NULL DEFAULT 0,
+  effective_compilation NOT NULL DEFAULT 0,
+  skipcount INTEGER NOT NULL DEFAULT 0,
+  score INTEGER NOT NULL DEFAULT 0,
+  beginning INTEGER NOT NULL DEFAULT 0,
+  cue_path TEXT,
+  unavailable INTEGER DEFAULT 0,
+  effective_albumartist TEXT,
+  etag TEXT
+);
+
+CREATE VIRTUAL TABLE subsonic_songs_fts USING fts3 (
+  ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsgenre, ftscomment,
+  tokenize=unicode
+);
+
+UPDATE schema_version SET version=43;

src/CMakeLists.txt

@@ -194,6 +194,9 @@ set(SOURCES
   internet/somafmservice.cpp
   internet/somafmurlhandler.cpp
   internet/soundcloudservice.cpp
+  internet/subsonicservice.cpp
+  internet/subsonicsettingspage.cpp
+  internet/subsonicurlhandler.cpp
 
   library/groupbydialog.cpp
   library/library.cpp
@@ -478,6 +481,9 @@ set(HEADERS
   internet/somafmservice.h
   internet/somafmurlhandler.h
   internet/soundcloudservice.h
+  internet/subsonicservice.h
+  internet/subsonicsettingspage.h
+  internet/subsonicurlhandler.h
 
   library/groupbydialog.h
   library/library.h
@@ -660,6 +666,7 @@ set(UI
   internet/magnatunesettingspage.ui
   internet/searchboxwidget.ui
   internet/spotifysettingspage.ui
+  internet/subsonicsettingspage.ui
 
   library/groupbydialog.ui
   library/libraryfilterwidget.ui

src/core/database.cpp

@@ -37,7 +37,7 @@
 #include <QVariant>
 
 const char* Database::kDatabaseFilename = "clementine.db";
-const int Database::kSchemaVersion = 42;
+const int Database::kSchemaVersion = 43;
 const char* Database::kMagicAllSongsTables = "%allsongstables";
 
 int Database::sNextConnectionId = 1;

src/internet/internetmodel.cpp

@@ -29,7 +29,9 @@
 #include "internetservice.h"
 #include "savedradio.h"
 #include "somafmservice.h"
+#include "groovesharkservice.h"
 #include "soundcloudservice.h"
+#include "subsonicservice.h"
 #include "core/closure.h"
 #include "core/logging.h"
 #include "core/mergedproxymodel.h"
@@ -94,6 +96,7 @@ InternetModel::InternetModel(Application* app, QObject* parent)
 #ifdef HAVE_SPOTIFY
   AddService(new SpotifyService(app, this));
 #endif
+  AddService(new SubsonicService(app, this));
 #ifdef HAVE_UBUNTU_ONE
   AddService(new UbuntuOneService(app, this));
 #endif