Merge lp:~tintou/noise/noise-gda-zeitgeist into lp:~elementary-apps/noise/trunk

[Corentin Noël]

Changed SQLHeavy to libGDA. Added Zeitgeist History.

Switched to GDA.
A lot of changes have been made in the structure of the application.
Playlists, Smart Playlists, Media, Device preferences and TreeView Headers are now directly using the database.
We need to provide the right .vapi until the release of libgda 6.0

The History playlist is now using Zeitgeist directly

Overall, big changes and (I hope) more stability.

[Danielle Foré (danrabbit)]

So far my only real complaints (besides issues present in trunk ofc) are:

* The duplication in the history playlist.
* Making sure we restore with the last-played track

I'm on the look out for crashes or any other weirdness :D

[lp:~tintou/noise/noise-gda-zeitgeist]

1833. By Corentin Noël on 2015-08-26

Ensure that History Playlist doesn't contain duplicates.

[Viko Adi Rahmawan (vikoadi)]

Searching crash the apps

Is it planned to ditch the whole _medias and _searched_medias? We can use gda query to search that. I think that would be more memory efficient.

[lp:~tintou/noise/noise-gda-zeitgeist]

1834. By Corentin Noël on 2015-08-27

Fixed rating parsing. Searchs now directly with the database.

1835. By Corentin Noël on 2015-08-27

Search for rating if the user search with only wildcards.

[Corentin Noël (tintou)]

Daniel:
 * The history playlist is now deduplicated.
 * last-played bug is now fixed in granite
Viko Adi:
 * It now uses the Database directly, but _medias and _searched_medias are still required because we need to cache some values once they're retrieved from the database.

[Danielle Foré (danrabbit)]

Cody is working on the new granite release including an so name bump. So I guess this branch will need to require the new version of granite before it can be merged.

I can confirm that the history playlist is de-duplicated

I cannot confirm that search crashes the app.

[Danielle Foré (danrabbit)]

I can confirm that after the granite update that the last played song is restored.

However, I'm getting this behavior where only the statusbar will show, then the rest of the UI. It's pretty odd. Anyone can reproduce?

[Viko Adi Rahmawan (vikoadi)]

@Daniel seems that media loading in initialize_library is too slow in large library, maybe we should run it on async thread, running search in thread seems to be good idea too.

[Viko Adi Rahmawan (vikoadi)]

Search works great now

@Daniel seems that media loading in initialize_library is too slow in large library, maybe we should run it on async thread, running search in thread seems to be good idea too.

[xapantu (xapantu)]

The code looks fine (but the diff is very long). I have some issues with sorting on Archlinux, but after some discussions, it appears that it could be caused by a newer gtk and a newer gda. Anyway, this should be merged in trunk so as this work can be carried on.

The import is slow, but it was also slow with the trunk, so probably nothing new here.

review: Approve

[Danielle Foré (danrabbit)]

Since Lucas marked this as "approve", I'm going to move the status of the MR to "approve" as well

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-06 19:13:13 +0000
+++ CMakeLists.txt	2015-08-27 10:21:27 +0000
@@ -86,11 +86,15 @@
 set (DEPS_PACKAGES
   ${CORE_LIBRARY_NAME}
   ${CORE_PACKAGES} # this is needed until we provide a ${CORE_LIBRARY_NAME}.deps file
+  libgda-5.0
   taglib_c
+  zeitgeist-2.0
 )
 
 set (DEPS_PKG
+  libgda-5.0
   taglib_c
+  zeitgeist-2.0
 )
 
 find_package (PkgConfig)
@@ -113,26 +117,6 @@
 )
 
 #
-# SQLHeavy: Use version 0.2 if it is available; otherwise, fall back to 0.1
-#
-pkg_check_modules (SQLHEAVY2 QUIET sqlheavy-0.2)
-if (SQLHEAVY2_FOUND)
-  message ("-- Will use sqlheavy-0.2")
-  set (DEPS_PACKAGES ${DEPS_PACKAGES} sqlheavy-0.2)
-  set (SQLHEAVY_CFLAGS ${SQLHEAVY2_CFLAGS})
-  set (SQLHEAVY_LIBRARY_DIRS ${SQLHEAVY2_LIBRARY_DIRS})
-  set (SQLHEAVY_LIBRARIES ${SQLHEAVY2_LIBRARIES})
-else ()
-  message ("-- Will use sqlheavy-0.1")
-  pkg_check_modules (SQLHEAVY REQUIRED sqlheavy-0.1)
-  set (DEPS_PACKAGES ${DEPS_PACKAGES} sqlheavy-0.1)
-endif ()
-
-set (DEPS_CFLAGS ${DEPS_CFLAGS} ${SQLHEAVY_CFLAGS})
-set (DEPS_LIBRARIES ${DEPS_LIBRARIES} ${SQLHEAVY_LIBRARIES})
-set (DEPS_LIBRARY_DIRS ${DEPS_LIBRARY_DIRS} ${SQLHEAVY_LIBRARY_DIRS})
-
-#
 # Libnotify
 #
 pkg_check_modules (LIBNOTIFY QUIET libnotify)

=== modified file 'core/CMakeLists.txt'
--- core/CMakeLists.txt	2015-05-24 21:40:48 +0000
+++ core/CMakeLists.txt	2015-08-27 10:21:27 +0000
@@ -29,7 +29,6 @@
   Devices/Device.vala
   Devices/NetworkDevice.vala
   Devices/DeviceManager.vala
-  Devices/DevicePreferences.vala
   Playlists/Playlist.vala
   Playlists/StaticPlaylist.vala
   Playlists/SmartPlaylist.vala

=== modified file 'core/Devices/Device.vala'
--- core/Devices/Device.vala	2015-06-12 13:51:08 +0000
+++ core/Devices/Device.vala	2015-08-27 10:21:27 +0000
@@ -34,8 +34,7 @@
     public signal void initialized (Device d);
     public signal void device_unmounted ();
     public signal void infobar_message (string message, Gtk.MessageType type);
-    
-    public abstract DevicePreferences get_preferences();
+
     public abstract bool start_initialization();
     public abstract void finish_initialization();
     public abstract string getContentType();
@@ -113,9 +112,9 @@
             return get_capacity () > (list_size - without_size);
         }
     }
-    
-    public string get_unique_identifier() {
-        Mount? m = get_mount();
+
+    public virtual string get_unique_identifier () {
+        Mount? m = get_mount ();
         if (m != null) {
             string uuid = m.get_uuid();
             File root = m.get_root();

=== modified file 'core/Devices/DeviceManager.vala'
--- core/Devices/DeviceManager.vala	2015-06-12 13:51:08 +0000
+++ core/Devices/DeviceManager.vala	2015-08-27 10:21:27 +0000
@@ -39,7 +39,6 @@
     public signal void mount_added (Mount mount);
     public signal void mount_removed (Mount mount);
 
-    private Gee.TreeSet<DevicePreferences> device_preferences;
     private Gee.TreeSet<unowned Device> initialized_devices;
     private Gee.TreeSet<unowned Mount> mounts_availables;
     private Gee.TreeSet<Playlist> local_playlists;
@@ -53,7 +52,6 @@
     }
 
     private DeviceManager () {
-        device_preferences = new Gee.TreeSet<DevicePreferences> ();
         initialized_devices = new Gee.TreeSet<unowned Device> ();
         mounts_availables = new Gee.TreeSet<unowned Mount> ();
         local_playlists = new Gee.TreeSet<Playlist> ();
@@ -67,10 +65,6 @@
         get_pre_existing_mounts.begin ();
     }
 
-    public void set_device_preferences (Gee.Collection<DevicePreferences> device_preferences) {
-        this.device_preferences.add_all (device_preferences);
-    }
-
     public async void get_pre_existing_mounts () {
         var mounts = new Gee.TreeSet<Mount> ();
         var volumes = new Gee.TreeSet<Volume> ();
@@ -118,15 +112,6 @@
         //message ("mount_preunmount:%s\n", mount.get_uuid());
     }
 
-    public DevicePreferences? get_device_preferences (string id) {
-        foreach (var device in device_preferences) {
-            if (device.id == id)
-                return device;
-        }
-
-        return null;
-    }
-
     public Gee.Collection<unowned Device> get_initialized_devices () {
         return initialized_devices;
     }
@@ -134,10 +119,4 @@
     public Gee.Collection<unowned Mount> get_available_mounts () {
         return mounts_availables;
     }
-
-    public void add_device_preferences (DevicePreferences dp) {
-        lock (device_preferences) {
-            device_preferences.add (dp);
-        }
-    }
 }

=== modified file 'core/LibrariesManager.vala'
--- core/LibrariesManager.vala	2015-06-12 13:51:08 +0000
+++ core/LibrariesManager.vala	2015-08-27 10:21:27 +0000
@@ -29,21 +29,25 @@
  */
 
 public class Noise.LibrariesManager : GLib.Object {
-    
+    /**
+     * Headless playlists are playlists that are not linked to a library.
+     */
+    public signal void add_headless_playlist (StaticPlaylist playlist);
+
     public signal void library_removed (Library library);
     public signal void library_added (Library library);
-    
+
     public signal void cancel_transfer ();
     public signal void operation_terminated ();
-    
+
     public double progress;
     public string current_operation;
     private string old_search = null;
-    
+
     private Gee.HashMap<Library, int> libraries;
     private int current_index = 0;
     public Library local_library;
-    
+
     public LibrariesManager () {
         libraries = new Gee.HashMap<Library, int> ();
     }

=== modified file 'core/Library.vala'
--- core/Library.vala	2015-06-12 13:51:08 +0000
+++ core/Library.vala	2015-08-27 10:21:27 +0000
@@ -66,9 +66,9 @@
     public abstract Media? find_media (Media to_find);
     public abstract Media? media_from_file (File file);
     public abstract Media? media_from_uri (string uri);
-    public abstract Media? media_from_id (int id);
+    public abstract Media? media_from_id (int64 id);
     public abstract Gee.Collection<Media> medias_from_uris (Gee.Collection<string> uris);
-    public abstract Gee.Collection<Media> medias_from_ids (Gee.Collection<int> ids);
+    public abstract Gee.Collection<Media> medias_from_ids (Gee.Collection<int64?> ids);
     public abstract void update_media (Media s, bool updateMeta, bool record_time);
     public abstract void update_medias (Gee.Collection<Media> updates, bool updateMeta, bool record_time);
     public abstract void remove_media (Media s, bool trash);
@@ -76,14 +76,14 @@
     
     public abstract bool support_smart_playlists ();
     public abstract void add_smart_playlist (SmartPlaylist p);
-    public abstract void remove_smart_playlist (int id);
-    public abstract SmartPlaylist? smart_playlist_from_id (int id);
+    public abstract void remove_smart_playlist (int64 id);
+    public abstract SmartPlaylist? smart_playlist_from_id (int64 id);
     public abstract SmartPlaylist? smart_playlist_from_name (string name);
     
     public abstract bool support_playlists ();
     public abstract void add_playlist (StaticPlaylist p);
-    public abstract void remove_playlist (int id);
-    public abstract StaticPlaylist? playlist_from_id (int id);
+    public abstract void remove_playlist (int64 id);
+    public abstract StaticPlaylist? playlist_from_id (int64 id);
     public abstract StaticPlaylist? playlist_from_name (string name);
     
     public abstract bool start_file_operations (string? message);
@@ -99,7 +99,7 @@
         return i;
     }
 
-    public void media_from_name (Gee.Collection<Media> tests, Gee.Collection<int> found, Gee.Collection<Media> not_found) {
+    public void media_from_name (Gee.Collection<Media> tests, Gee.Collection<int64?> found, Gee.Collection<Media> not_found) {
         foreach (Media test in tests) {
             var media_found = find_media (test);
             if (media_found != null) {

=== modified file 'core/Media.vala'
--- core/Media.vala	2015-06-12 13:51:08 +0000
+++ core/Media.vala	2015-08-27 10:21:27 +0000
@@ -33,7 +33,7 @@
     /// Used for unknown titles, artists, or album names.
     protected static string UNKNOWN = _("Unknown");
 
-    public int rowid { get; set; }
+    public int64 rowid { get; set; }
 
     public virtual string uri {
         owned get { return file.get_uri (); }

=== modified file 'core/Playlists/Playlist.vala'
--- core/Playlists/Playlist.vala	2015-06-12 14:41:35 +0000
+++ core/Playlists/Playlist.vala	2015-08-27 10:21:27 +0000
@@ -32,10 +32,10 @@
     public signal void request_play ();
     public virtual Gee.ArrayQueue<Media> medias { get; internal set; }
 
-    public int rowid { get; set; }
+    public int64 rowid { get; set; }
     public GLib.Icon icon;
-    private string _name = "";
-    public string name {
+    internal string _name = "";
+    public virtual string name {
         get {
             return _name;
         } 

=== modified file 'core/Playlists/SmartPlaylist.vala'
--- core/Playlists/SmartPlaylist.vala	2015-06-12 14:41:35 +0000
+++ core/Playlists/SmartPlaylist.vala	2015-08-27 10:21:27 +0000
@@ -35,14 +35,14 @@
         ANY = false
     }
 
-    public ConditionalType conditional { get; set; default = ConditionalType.ALL; }
+    public virtual ConditionalType conditional { get; set; default = ConditionalType.ALL; }
     public Gee.TreeSet<SmartQuery> queries;
     public int query_count { get; set; default = 0; }
 
-    public bool limit { get; set; default = false; }
-    public int limit_amount { get; set; default = 50; }
+    public virtual bool limit { get; set; default = false; }
+    public virtual uint limit_amount { get; set; default = 50; }
 
-    private Noise.Library library;
+    protected Noise.Library library;
 
     /*
      * A SmartPlaylist should be linked to only one library.
@@ -142,112 +142,112 @@
         switch (q.field) {
             case Noise.SmartQuery.FieldType.ALBUM :
                 if(q.comparator == SmartQuery.ComparatorType.IS)
-                    return q.value.down() == s.album.down();
+                    return q.value.get_string ().down () == s.album.down();
                 else if(q.comparator == SmartQuery.ComparatorType.CONTAINS)
-                    return (q.value.down() in s.album.down());
+                    return (q.value.get_string ().down() in s.album.down());
                 else if(q.comparator == SmartQuery.ComparatorType.NOT_CONTAINS)
-                    return !(q.value.down() in s.album.down());
+                    return !(q.value.get_string ().down() in s.album.down());
                 break;
             case Noise.SmartQuery.FieldType.ARTIST:
                 if(q.comparator == SmartQuery.ComparatorType.IS)
-                    return q.value.down() == s.artist.down();
+                    return q.value.get_string ().down() == s.artist.down();
                 else if(q.comparator == SmartQuery.ComparatorType.CONTAINS)
-                    return (q.value.down() in s.artist.down());
+                    return (q.value.get_string ().down() in s.artist.down());
                 else if(q.comparator == SmartQuery.ComparatorType.NOT_CONTAINS)
-                    return !(q.value.down() in s.artist.down());
+                    return !(q.value.get_string ().down() in s.artist.down());
                 break;
             case Noise.SmartQuery.FieldType.COMPOSER:
                 if(q.comparator == SmartQuery.ComparatorType.IS)
-                    return q.value.down() == s.composer.down();
+                    return q.value.get_string ().down() == s.composer.down();
                 else if(q.comparator == SmartQuery.ComparatorType.CONTAINS)
-                    return (q.value.down() in s.composer.down());
+                    return (q.value.get_string ().down() in s.composer.down());
                 else if(q.comparator == SmartQuery.ComparatorType.NOT_CONTAINS)
-                    return !(q.value.down() in s.composer.down());
+                    return !(q.value.get_string ().down() in s.composer.down());
                 break;
             case Noise.SmartQuery.FieldType.COMMENT:
                 if(q.comparator == SmartQuery.ComparatorType.IS)
-                    return q.value.down() == s.comment.down();
+                    return q.value.get_string ().down() == s.comment.down();
                 else if(q.comparator == SmartQuery.ComparatorType.CONTAINS)
-                    return (q.value.down() in s.comment.down());
+                    return (q.value.get_string ().down() in s.comment.down());
                 else if(q.comparator == SmartQuery.ComparatorType.NOT_CONTAINS)
-                    return !(q.value.down() in s.comment.down());
+                    return !(q.value.get_string ().down() in s.comment.down());
                 break;
             case Noise.SmartQuery.FieldType.GENRE:
                 if(q.comparator == SmartQuery.ComparatorType.IS)
-                    return q.value.down() == s.genre.down();
+                    return q.value.get_string ().down() == s.genre.down();
                 else if(q.comparator == SmartQuery.ComparatorType.CONTAINS)
-                    return (q.value.down() in s.genre.down());
+                    return (q.value.get_string ().down() in s.genre.down());
                 else if(q.comparator == SmartQuery.ComparatorType.NOT_CONTAINS)
-                    return !(q.value.down() in s.genre.down());
+                    return !(q.value.get_string ().down() in s.genre.down());
                 break;
             case Noise.SmartQuery.FieldType.GROUPING:
                 if(q.comparator == SmartQuery.ComparatorType.IS)
-                    return q.value.down() == s.grouping.down();
+                    return q.value.get_string ().down() == s.grouping.down();
                 else if(q.comparator == SmartQuery.ComparatorType.CONTAINS)
-                    return (q.value.down() in s.grouping.down());
+                    return (q.value.get_string ().down() in s.grouping.down());
                 else if(q.comparator == SmartQuery.ComparatorType.NOT_CONTAINS)
-                    return !(q.value.down() in s.grouping.down());
+                    return !(q.value.get_string ().down() in s.grouping.down());
                 break;
             case Noise.SmartQuery.FieldType.TITLE:
                 if(q.comparator == SmartQuery.ComparatorType.IS)
-                    return q.value.down() == s.title.down();
+                    return q.value.get_string ().down() == s.title.down();
                 else if(q.comparator == SmartQuery.ComparatorType.CONTAINS)
-                    return (q.value.down() in s.title.down());
+                    return (q.value.get_string ().down() in s.title.down());
                 else if(q.comparator == SmartQuery.ComparatorType.NOT_CONTAINS)
-                    return !(q.value.down() in s.title.down());
+                    return !(q.value.get_string ().down() in s.title.down());
                 break;
             case Noise.SmartQuery.FieldType.BITRATE:
                 if(q.comparator == SmartQuery.ComparatorType.IS_EXACTLY)
-                    return int.parse(q.value) == s.bitrate;
+                    return q.value.get_int () == s.bitrate;
                 else if(q.comparator == SmartQuery.ComparatorType.IS_AT_MOST)
-                    return (s.bitrate <= int.parse(q.value));
+                    return (s.bitrate <= q.value.get_int ());
                 else if(q.comparator == SmartQuery.ComparatorType.IS_AT_LEAST)
-                    return (s.bitrate >= int.parse(q.value));
+                    return (s.bitrate >= q.value.get_int ());
                 break;
             case Noise.SmartQuery.FieldType.PLAYCOUNT:
                 if(q.comparator == SmartQuery.ComparatorType.IS_EXACTLY)
-                    return int.parse(q.value) == s.play_count;
+                    return q.value.get_int () == s.play_count;
                 else if(q.comparator == SmartQuery.ComparatorType.IS_AT_MOST)
-                    return (s.play_count <= int.parse(q.value));
+                    return (s.play_count <= q.value.get_int ());
                 else if(q.comparator == SmartQuery.ComparatorType.IS_AT_LEAST)
-                    return (s.play_count >= int.parse(q.value));
+                    return (s.play_count >= q.value.get_int ());
                 break;
             case Noise.SmartQuery.FieldType.SKIPCOUNT:
                 if(q.comparator == SmartQuery.ComparatorType.IS_EXACTLY)
-                    return int.parse(q.value) == s.skip_count;
+                    return q.value.get_int () == s.skip_count;
                 else if(q.comparator == SmartQuery.ComparatorType.IS_AT_MOST)
-                    return (s.skip_count <= int.parse(q.value));
+                    return (s.skip_count <= q.value.get_int ());
                 else if(q.comparator == SmartQuery.ComparatorType.IS_AT_LEAST)
-                    return (s.skip_count >= int.parse(q.value));
+                    return (s.skip_count >= q.value.get_int ());
                 break;
             case Noise.SmartQuery.FieldType.YEAR:
                 if(q.comparator == SmartQuery.ComparatorType.IS_EXACTLY)
-                    return int.parse (q.value) == s.year;
+                    return q.value.get_int () == s.year;
                 else if(q.comparator == SmartQuery.ComparatorType.IS_AT_MOST)
-                    return (s.year <= int.parse (q.value));
+                    return (s.year <= q.value.get_int ());
                 else if(q.comparator == SmartQuery.ComparatorType.IS_AT_LEAST)
-                    return (s.year >= int.parse (q.value));
+                    return (s.year >= q.value.get_int ());
                 break;
             case Noise.SmartQuery.FieldType.LENGTH:
                 if(q.comparator == SmartQuery.ComparatorType.IS_EXACTLY)
-                    return int.parse (q.value) == s.length;
+                    return q.value.get_int () == s.length;
                 else if(q.comparator == SmartQuery.ComparatorType.IS_AT_MOST)
-                    return (s.length <= int.parse (q.value));
+                    return (s.length <= q.value.get_int ());
                 else if(q.comparator == SmartQuery.ComparatorType.IS_AT_LEAST)
-                    return (s.length >= int.parse (q.value));
+                    return (s.length >= q.value.get_int ());
                 break;
             case Noise.SmartQuery.FieldType.RATING:
                 if(q.comparator == SmartQuery.ComparatorType.IS_EXACTLY)
-                    return int.parse(q.value) == s.rating;
+                    return q.value.get_int () == s.rating;
                 else if(q.comparator == SmartQuery.ComparatorType.IS_AT_MOST)
-                    return (s.rating <= int.parse (q.value));
+                    return (s.rating <= q.value.get_int ());
                 else if(q.comparator == SmartQuery.ComparatorType.IS_AT_LEAST)
-                    return (s.rating >= int.parse (q.value));
+                    return (s.rating >= q.value.get_int ());
                 break;
             case Noise.SmartQuery.FieldType.DATE_ADDED:
                 var now = new DateTime.now_local ();
                 var played = new DateTime.from_unix_local (s.date_added);
-                played = played.add_days (int.parse (q.value));
+                played = played.add_days (q.value.get_int ());
             
                 if (q.comparator == SmartQuery.ComparatorType.IS_EXACTLY) {
                     return (now.get_day_of_year () == played.get_day_of_year () && now.get_year () == played.get_year ());
@@ -257,29 +257,13 @@
                     return now.compare (played) > 0;
                 }
                 break;
-            case Noise.SmartQuery.FieldType.DATE_RELEASED:
-/*
-                var now = new DateTime.now_local();
-                var released = new DateTime.from_unix_local(s.podcast_date);
-                released = released.add_days(int.parse(q.value));
-            
-                if(q.comparator == SmartQuery.ComparatorType.IS_EXACTLY)
-                    return (now.get_day_of_year() == released.get_day_of_year() && now.get_year() == released.get_year());
-                else if(q.comparator == SmartQuery.ComparatorType.IS_WITHIN) {
-                    return released.compare(now) > 0;
-                }
-                else if(q.comparator == SmartQuery.ComparatorType.IS_BEFORE) {
-                    return now.compare(released) > 0;
-                }
-*/
-                break;
             case Noise.SmartQuery.FieldType.LAST_PLAYED:
                 if(s.last_played == 0)
                     return false;
 
                 var now = new DateTime.now_local();
                 var played = new DateTime.from_unix_local (s.last_played);
-                played = played.add_days (int.parse (q.value));
+                played = played.add_days (q.value.get_int ());
 
                 if (q.comparator == SmartQuery.ComparatorType.IS_EXACTLY) {
                     return (now.get_day_of_year () == played.get_day_of_year () && now.get_year () == played.get_year ());

=== modified file 'core/Playlists/SmartQuery.vala'
--- core/Playlists/SmartQuery.vala	2015-06-12 14:41:35 +0000
+++ core/Playlists/SmartQuery.vala	2015-08-27 10:21:27 +0000
@@ -49,7 +49,6 @@
         COMMENT,
         COMPOSER,
         DATE_ADDED,
-        DATE_RELEASED,
         GENRE,
         GROUPING,
         LAST_PLAYED,
@@ -64,13 +63,13 @@
     public int rowid { get; set; default = 0; }
     public FieldType field { get; set; default = FieldType.ALBUM; }
     public ComparatorType comparator { get; set; default = ComparatorType.IS; }
-    public string value { get; set; default = ""; } //internally this often holds numbers, but that's ok.
+    public GLib.Value value { get; set; default = GLib.Value (typeof (int)); }
 
     public SmartQuery () {
         
     }
 
-    public SmartQuery.with_info (FieldType field, ComparatorType comparator, string value) {
+    public SmartQuery.with_info (FieldType field, ComparatorType comparator, GLib.Value value) {
         this.field = field;
         this.comparator = comparator;
         this.value = value;

=== modified file 'core/Settings.vala'
--- core/Settings.vala	2015-06-12 13:51:08 +0000
+++ core/Settings.vala	2015-08-27 10:21:27 +0000
@@ -67,8 +67,8 @@
         public bool write_metadata_to_file { get; set; }
         public bool copy_imported_music { get; set; }
         public bool close_while_playing { get; set; }
-        public int last_media_playing { get; set; }
-        public int last_playlist_playing { get; set; }
+        public int64 last_media_playing { get; set; }
+        public string last_playlist_playing { get; set; }
         public int last_media_position { get; set; }
         public Shuffle shuffle_mode { get; set; }
         public Repeat repeat_mode { get; set; }

=== modified file 'core/Utils/Search.vala'
--- core/Utils/Search.vala	2015-06-12 13:51:08 +0000
+++ core/Utils/Search.vala	2015-08-27 10:21:27 +0000
@@ -109,18 +109,22 @@
      *   "  "
      *   "**a"
      */
-    public inline int get_rating_from_string (string rating_string)
-        ensures (result != 0 || result == -1)
+    public inline uint? get_rating_from_string (string rating_string)
+        ensures (result != 0)
     {
-        int i;
+        int i = 0;
         unichar c;
+        uint rating;
 
-        for (i = 0; rating_string.get_next_char (ref i, out c);) {
+        for (rating = 0; rating_string.get_next_char (ref i, out c); rating++) {
             if (c != '*')
-                return -1;
+                return null;
         }
 
-        return i > 0 ? i : -1;
+        if (rating == 0)
+            return null;
+
+        return rating;
     }
 
     public inline bool match_string_to_media (Media m, string search) {

=== modified file 'core/Utils/String.vala'
--- core/Utils/String.vala	2015-06-12 13:51:08 +0000
+++ core/Utils/String.vala	2015-08-27 10:21:27 +0000
@@ -178,13 +178,16 @@
      * @param parsed_search_string location where the canonicalized version of the
      * search string is stored. Should be passed to the methods in Noise.Search.
      */
-    public static void base_search_method (string search, out int parsed_rating,
+    public static void base_search_method (string search, out uint parsed_rating,
                                            out string parsed_search_string)
     {
-        parsed_rating = Search.get_rating_from_string (search.strip ());
+        var result = Search.get_rating_from_string (search.strip ());
 
-        if (parsed_rating > 0)
+        if (result != null) {
             parsed_rating = parsed_rating.clamp (1, 5);
+        } else {
+            parsed_rating = 0;
+        }
 
         parsed_search_string = Search.get_valid_search_string (search);
     }

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2014-06-16 14:04:06 +0000
+++ plugins/CMakeLists.txt	2015-08-27 10:21:27 +0000
@@ -12,7 +12,6 @@
   add_subdirectory (Devices)
   add_subdirectory (LastFM)
   add_subdirectory (MPRIS)
-  add_subdirectory (Zeitgeist)
 else ()
   message ("-- Plugins disabled")
 endif ()

=== modified file 'plugins/Devices/AudioPlayers/AudioPlayerDevice.vala'
--- plugins/Devices/AudioPlayers/AudioPlayerDevice.vala	2015-02-24 00:04:03 +0000
+++ plugins/Devices/AudioPlayers/AudioPlayerDevice.vala	2015-08-27 10:21:27 +0000
@@ -24,31 +24,20 @@
 
     Mount mount;
     GLib.Icon icon;
-    Noise.DevicePreferences pref;
     bool is_androphone = false;
     Gee.LinkedList<string> music_folders;
-    
+
     private AudioPlayerLibrary library;
-    
-    
+
     public AudioPlayerDevice(Mount mount, bool is_androphone) {
         this.mount = mount;
         this.is_androphone = is_androphone;
         music_folders = new Gee.LinkedList<string> ();
         library = new AudioPlayerLibrary (this);
         libraries_manager.add_library (library);
-        icon = new Icon (is_androphone ? "phone" : "music-player").gicon;
-        var device_manager = DeviceManager.get_default ();
-        pref = device_manager.get_device_preferences (get_unique_identifier());
-        if(pref == null) {
-            pref = new Noise.DevicePreferences (get_unique_identifier());
-            device_manager.add_device_preferences (pref);
-        }
-    }
-    
-    public Noise.DevicePreferences get_preferences() {
-        return pref;
-    }
+        icon = new GLib.ThemedIcon (is_androphone ? "phone" : "music-player");
+    }
+
     public void finish_initialization() {
         device_unmounted.connect( () => {
             
@@ -231,7 +220,7 @@
     }
     
     public void synchronize () {
-        library.sync_medias ();
+        
     }
     
     public bool only_use_custom_view () {

=== modified file 'plugins/Devices/AudioPlayers/AudioPlayerLibrary.vala'
--- plugins/Devices/AudioPlayers/AudioPlayerLibrary.vala	2015-02-24 00:04:03 +0000
+++ plugins/Devices/AudioPlayers/AudioPlayerLibrary.vala	2015-08-27 10:21:27 +0000
@@ -110,7 +110,7 @@
                 return;
             }
             
-            int parsed_rating;
+            uint parsed_rating;
             string parsed_search_string;
             String.base_search_method (search, out parsed_rating, out parsed_search_string);
             bool rating_search = parsed_rating > 0;
@@ -118,7 +118,7 @@
             lock (medias) {
                 foreach (var m in medias) {
                     if (rating_search) {
-                        if (m.rating == (uint) parsed_rating)
+                        if (m.rating == parsed_rating)
                             searched_medias.add (m);
                     } else if (Search.match_string_to_media (m, parsed_search_string)) {
                         searched_medias.add (m);
@@ -185,96 +185,8 @@
         }
         return;
     }
-    
-    public void sync_medias () {
-        if(doing_file_operations ()) {
-            warning("Tried to add when already syncing\n");
-            return;
-        }
-        Playlist playlist = null;
-        if (device.get_preferences().sync_all_music == false) {
-            playlist = device.get_preferences().music_playlist;
-            if (playlist == null)
-                return;
-        }
-        
-        
-        libraries_manager.current_operation = _("Syncing <b>%s</b>…").printf (device.getDisplayName ());
-        
-        is_doing_file_operations = true;
-        Timeout.add(500, libraries_manager.do_progress_notification_with_timeout);
-        if (playlist == null)
-            sync_medias_async.begin (libraries_manager.local_library.get_medias ());
-        else
-            sync_medias_async.begin (playlist.medias);
-        return;
-    }
-    
-    public async void sync_medias_async (Gee.Collection<Noise.Media> songs) {
-        var medias_to_remove = new Gee.LinkedList<Noise.Media> ();
-        medias_to_remove.add_all (device.delete_doubles (medias, songs));
-        
-        var medias_to_sync = new Gee.LinkedList<Noise.Media> ();
-        medias_to_sync.add_all (device.delete_doubles (songs, medias));
-        
-        int total_medias = medias_to_remove.size + medias_to_sync.size;
-        
-        int sub_index = 0;
-        if (total_medias > 0) {
-            if (device.will_fit_without (medias_to_sync, medias_to_remove)) {
-                foreach(var m in medias_to_remove) {
-                    if(!operation_cancelled) {
-                        remove_media(m, true);
-                    }
-                    ++sub_index;
-                    libraries_manager.progress = (double)(sub_index/total_medias);
-                }
-                sub_index = 0;
-                imported_files = new Gee.LinkedList<string> ();
-                foreach(var m in medias_to_sync) {
-                    if(!operation_cancelled) {
-                        add_media (m);
-                    }
-                    ++sub_index;
-                    libraries_manager.progress = (double)(sub_index/total_medias);
-                }
-                tagger.discoverer_import_media (imported_files);
-                
-                if(!operation_cancelled) {
-                    // sync playlists
-                    /* TODO: add support for podcasts & playlists
-                    if (pref.sync_all_music == true) {
-                        sync_playlists();
-                    }
-                    if (pref.sync_all_podcasts == true) {
-                        sync_podcasts();
-                    }*/
-                    
-                    libraries_manager.current_operation = _("Finishing sync process…");
-                    
-                } else {
-                    libraries_manager.current_operation = _("Cancelling Sync…");
-                    libraries_manager.progress = 1;
-                }
-            } else {
-                    device.infobar_message (_("There is not enough space on Device to complete the Sync…"), Gtk.MessageType.INFO);
-                    libraries_manager.current_operation = _("There is not enough space on Device to complete the Sync…");
-            }
-        }
 
-        Idle.add( () => {
-            libraries_manager.progress = 1;
-            device.get_preferences().last_sync_time = (int)time_t();
-            is_doing_file_operations = false;
-            
-            file_operations_done ();
-            operation_cancelled = false;
-            
-            return false;
-        });
-    }
-    
-    public override Media? media_from_id (int id) {
+    public override Media? media_from_id (int64 id) {
         lock (medias) {
             foreach (var m in medias) {
                 if (m.rowid == id) {
@@ -284,7 +196,8 @@
         }
         return null;
     }
-    public override Gee.Collection<Media> medias_from_ids (Gee.Collection<int> ids) {
+
+    public override Gee.Collection<Media> medias_from_ids (Gee.Collection<int64?> ids) {
         var media_collection = new Gee.LinkedList<Media> ();
 
         lock (medias) {
@@ -406,10 +319,10 @@
     public override void add_smart_playlist (SmartPlaylist p) {
     
     }
-    public override void remove_smart_playlist (int id) {
+    public override void remove_smart_playlist (int64 id) {
     
     }
-    public override SmartPlaylist? smart_playlist_from_id (int id) {
+    public override SmartPlaylist? smart_playlist_from_id (int64 id) {
         return null;
     }
     public override SmartPlaylist? smart_playlist_from_name (string name) {
@@ -429,14 +342,18 @@
         p.media_removed.connect(() => {keep_playlist_synchronized (p);});
         p.updated.connect ((old_name) => {remove_playlist_from_name (old_name); keep_playlist_synchronized (p);});
     }
-    public override void remove_playlist (int id) {
+    public override void remove_playlist (int64 id) {
         if (id < get_playlists ().size) {
             var array_v = new Gee.ArrayList<StaticPlaylist> ();
             array_v.add_all (playlists);
-            var p = array_v.get (id);
-            remove_playlist_from_name (p.name);
-            playlist_removed (p);
-            playlists.remove (p);
+            foreach (var p in array_v) {
+                if (p.rowid == id) {
+                    remove_playlist_from_name (p.name);
+                    playlist_removed (p);
+                    playlists.remove (p);
+                    return;
+                }
+            }
         }
     }
     
@@ -475,11 +392,14 @@
         }
     }
     
-    public override StaticPlaylist? playlist_from_id (int id) {
+    public override StaticPlaylist? playlist_from_id (int64 id) {
         if (id < get_playlists ().size) {
             var array = new Gee.ArrayList<StaticPlaylist> ();
             array.add_all (get_playlists ());
-            return array.get (id);
+            foreach (var playlist in array) {
+                if (playlist.rowid == id)
+                    return playlist;
+            }
         }
         return null;
     }

=== modified file 'plugins/Devices/CDRom/CDRomDevice.vala'
--- plugins/Devices/CDRom/CDRomDevice.vala	2015-06-12 13:31:55 +0000
+++ plugins/Devices/CDRom/CDRomDevice.vala	2015-08-27 10:21:27 +0000
@@ -48,7 +48,7 @@
     
     public CDRomDevice(Mount mount) {
         this.mount = mount;
-        this.icon = new Icon ("media-cdrom-audio").gicon;
+        this.icon = new GLib.ThemedIcon ("media-cdrom-audio");
         this.display_name = mount.get_name();
         
         list = new Gee.LinkedList<Noise.Media>();
@@ -58,11 +58,7 @@
         cdplayer = new CDPlayer (mount);
         Noise.App.player.add_playback (cdplayer);
     }
-    
-    public Noise.DevicePreferences get_preferences() {
-        return new Noise.DevicePreferences(get_unique_identifier());
-    }
-    
+
     public bool start_initialization() {
         return true;
     }

=== modified file 'plugins/Devices/CDRom/CDViewWrapper.vala'
--- plugins/Devices/CDRom/CDViewWrapper.vala	2015-06-12 16:10:33 +0000
+++ plugins/Devices/CDRom/CDViewWrapper.vala	2015-08-27 10:21:27 +0000
@@ -28,7 +28,7 @@
 
     public CDViewWrapper (Noise.StaticPlaylist p) {
         base (ViewWrapper.Hint.READ_ONLY_PLAYLIST, libraries_manager.local_library);
-        tvs = new TreeViewSetup(ListColumn.NUMBER, Gtk.SortType.ASCENDING, ViewWrapper.Hint.ALBUM_LIST);
+        tvs = new TreeViewSetup (ViewWrapper.Hint.PLAYLIST);
         message_head = _("An Error Occured");
         message_body = _("There was an error while loading this Audio CD.");
         message_type = Gtk.MessageType.ERROR;

=== modified file 'plugins/Devices/iPod/iPodDevice.vala'
--- plugins/Devices/iPod/iPodDevice.vala	2015-02-24 00:04:03 +0000
+++ plugins/Devices/iPod/iPodDevice.vala	2015-08-27 10:21:27 +0000
@@ -21,7 +21,6 @@
  */
 
 public class Noise.Plugins.iPodDevice : GLib.Object, Noise.Device {
-    Noise.DevicePreferences pref;
     GPod.iTunesDB db;
     public Mount mount;
     GLib.Icon icon;
@@ -32,17 +31,7 @@
     public iPodDevice (Mount mount) {
         this.mount = mount;
         is_new = mount.get_default_location ().get_parse_name ().has_prefix ("afc://");
-        var device_manager = DeviceManager.get_default ();
-        pref = device_manager.get_device_preferences (get_unique_identifier ());
-        icon = new Icon (is_new ? "phone" : "multimedia-player").gicon;
-        if (pref == null) {
-            pref = new Noise.DevicePreferences (get_unique_identifier ());
-            device_manager.add_device_preferences (pref);
-        }
-    }
-
-    public Noise.DevicePreferences get_preferences () {
-        return pref;
+        icon = new GLib.ThemedIcon (is_new ? "phone" : "multimedia-player");
     }
 
     public bool start_initialization () {

=== modified file 'plugins/Devices/iPod/iPodLibrary.vala'
--- plugins/Devices/iPod/iPodLibrary.vala	2015-03-13 18:01:49 +0000
+++ plugins/Devices/iPod/iPodLibrary.vala	2015-08-27 10:21:27 +0000
@@ -96,7 +96,7 @@
                 return;
             }
 
-            int parsed_rating;
+            uint parsed_rating;
             string parsed_search_string;
             String.base_search_method (search, out parsed_rating, out parsed_search_string);
             bool rating_search = parsed_rating > 0;
@@ -104,7 +104,7 @@
             lock (medias) {
                 foreach (var m in medias.values) {
                     if (rating_search) {
-                        if (m.rating == (uint) parsed_rating)
+                        if (m.rating == parsed_rating)
                             searched_medias.add (m);
                     } else if (Search.match_string_to_media (m, parsed_search_string)) {
                         searched_medias.add (m);
@@ -242,11 +242,11 @@
         });
     }
 
-    public override Media? media_from_id (int id) {
+    public override Media? media_from_id (int64 id) {
         return null;
     }
 
-    public override Gee.Collection<Media> medias_from_ids (Gee.Collection<int> ids) {
+    public override Gee.Collection<Media> medias_from_ids (Gee.Collection<int64?> ids) {
         var media_collection = new Gee.LinkedList<Media> ();
         lock (medias) {
             foreach (var m in medias.values) {
@@ -406,11 +406,11 @@
         return false;
     }
 
-    public override void remove_smart_playlist (int id) {
+    public override void remove_smart_playlist (int64 id) {
         
     }
 
-    public override SmartPlaylist? smart_playlist_from_id (int id) {
+    public override SmartPlaylist? smart_playlist_from_id (int64 id) {
         return null;
     }
 
@@ -439,24 +439,27 @@
         p.media_removed.connect((list) => {keep_playlist_synchronized (p, list, false);});
     }
 
-    public override void remove_playlist (int id) {
-        if (id < get_playlists ().size) {
-            var array = new Gee.ArrayList<unowned GPod.Playlist> ();
-            array.add_all (playlists.keys);
-            var array_v = new Gee.ArrayList<StaticPlaylist> ();
-            array_v.add_all (playlists.values);
-            playlist_removed (array_v.get (id));
-            playlists.unset (array.get (id));
-            db.start_sync ();
-            array.get (id).remove ();
-            try {
-                db.write ();
-            } catch (Error err) {
-                critical ("Error when writing iPod database. iPod contents may be incorrect: %s", err.message);
+    public override void remove_playlist (int64 id) {
+        unowned GPod.Playlist to_unset = null;
+        foreach (var entry in playlists.entries) {
+            if (entry.value.rowid == id) {
+                playlist_removed (entry.value);
+                to_unset = entry.key;
             }
-
-            db.stop_sync ();
-        }
+        }
+
+        if (to_unset != null)
+            playlists.unset (to_unset);
+
+        db.start_sync ();
+        to_unset.remove ();
+        try {
+            db.write ();
+        } catch (Error err) {
+            critical ("Error when writing iPod database. iPod contents may be incorrect: %s", err.message);
+        }
+
+        db.stop_sync ();
     }
 
     private void keep_playlist_synchronized (StaticPlaylist p, Gee.Collection<Media> m, bool to_add) {
@@ -488,12 +491,13 @@
         db.stop_sync ();
     }
 
-    public override StaticPlaylist? playlist_from_id (int id) {
-        if (id < get_playlists ().size) {
-            var array = new Gee.ArrayList<StaticPlaylist> ();
-            array.add_all (get_playlists ());
-            return array.get (id);
+    public override StaticPlaylist? playlist_from_id (int64 id) {
+        foreach (var p in playlists.values) {
+            if (p.rowid == id) {
+                return p;
+            }
         }
+
         return null;
     }
 
@@ -562,157 +566,6 @@
         }
     }
 
-    public bool sync_medias (Gee.Collection<Noise.Media> medias) {
-        if (is_doing_file_operations) {
-            warning("Tried to sync when already syncing\n");
-            return false;
-        }
-
-        libraries_manager.current_operation = _("Syncing <b>%s</b>…").printf (device.getDisplayName ());
-        is_doing_file_operations = true;
-        Timeout.add(500, libraries_manager.do_progress_notification_with_timeout);
-        sync_medias_async.begin (medias);
-        return true;
-    }
-
-    public async void sync_medias_async (Gee.Collection<Noise.Media> given_medias) {
-        bool error_occurred = false;
-        int sub_index = 0;
-        debug ("Found %d medias to sync.", given_medias.size);
-        var medias_to_remove = device.delete_doubles (medias.values, given_medias);
-        debug ("Found %d medias to remove.", medias_to_remove.size);
-        var medias_to_sync = device.delete_doubles (given_medias, medias.values);
-        debug ("Found %d medias to add.", medias_to_sync.size);
-        int total_medias = medias_to_remove.size + medias_to_sync.size;
-        if (total_medias > 0) {
-            if (device.will_fit_without(medias_to_sync, medias_to_remove)) {
-                db.start_sync();
-                foreach (var m in medias_to_remove) {
-                    if (!operation_cancelled) {
-                        foreach (var e in medias.entries) {
-                            if (e.value == m) {
-                                remove_media_from_ipod (e.key);
-                                break;
-                            }
-                        }
-                    }
-
-                    ++sub_index;
-                    libraries_manager.progress = (double)(sub_index/total_medias);
-                }
-
-                foreach (var m in medias_to_sync) {
-                    if (!operation_cancelled) {
-                        add_media (m);
-                    }
-
-                    ++sub_index;
-                    libraries_manager.progress = (double)(sub_index/total_medias);
-                }
-
-                if (!operation_cancelled) {
-                    // sync playlists
-                    /* TODO: add support for podcasts & playlists
-                    if (pref.sync_all_music == true) {
-                        sync_playlists();
-                    }
-                    if (pref.sync_all_podcasts == true) {
-                        sync_podcasts();
-                    }*/
-
-                    libraries_manager.current_operation = _("Finishing sync process…");
-                    try {
-                        db.write ();
-                    } catch (GLib.Error err) {
-                        error_occurred = true;
-                        operation_cancelled = true;
-                    }
-
-                    /// Clean up unused files
-                    debug ("Cleaning up iPod File System\n");
-                    var music_folder = File.new_for_uri (device.get_uri () + GPod.Device.get_music_dir (device.get_mount ().get_default_location ().get_path ()).replace (device.get_mount ().get_default_location ().get_path (), ""));
-                    var used_paths = new Gee.LinkedList<string> ();
-                    foreach (unowned GPod.Track t in medias.keys) {
-                        used_paths.add (device.get_uri () + GPod.iTunesDB.filename_ipod2fs (t.ipod_path));
-                    }
-
-                    cleanup_files (music_folder, used_paths);
-                    libraries_manager.progress = 1;
-                    db.stop_sync ();
-                } else {
-                    libraries_manager.current_operation = _("Cancelling Sync…");
-                    try {
-                        db.write ();
-                    } catch (Error err) {
-                        critical ("Error when writing iPod database. iPod contents may be incorrect: %s", err.message);
-                    }
-                    db.stop_sync ();
-                    libraries_manager.progress = 1;
-                }
-            } else {
-                    device.infobar_message (_("There is not enough space on Device to complete the Sync…"), Gtk.MessageType.INFO);
-                    libraries_manager.current_operation = _("There is not enough space on Device to complete the Sync…");
-            }
-        }
-
-        Idle.add (() => {
-            libraries_manager.progress = 1;
-            device.get_preferences ().last_sync_time = (int)time_t ();
-            is_doing_file_operations = false;
-            file_operations_done ();
-            operation_cancelled = false;
-            return false;
-        });
-    }
-    
-    public async void sync_playlists_async (Gee.Collection<Noise.Playlist> spls) {
-        
-        /*current_operation = _("Syncing playlists");
-        // first remove all playlists from db
-        var all_playlists = new Gee.LinkedList<unowned GPod.Playlist>();
-        foreach (unowned GPod.Playlist p in db.playlists) {
-            if (!p.is_mpl() && !p.is_podcasts() && !p.is_audiobooks()) {
-                all_playlists.add(p);
-            }
-        }
-        foreach (unowned GPod.Playlist p in all_playlists) {
-            p.remove();
-        }
-        
-        int sub_index = 0;
-        foreach (var playlist in pls) {
-            GPod.Playlist p = iPodPlaylistHelper.get_gpod_playlist_from_playlist (playlist);
-            db.playlist_add((owned)p, -1);
-            
-            unowned GPod.Playlist added = db.playlists.nth_data(db.playlists.length() - 1);
-            foreach (var entry in medias.entries) {
-                    foreach (var e in playlist.medias) {
-                        if (entry.value == e) {
-                            added.add_track(entry.key, -1);
-                            ++sub_index;
-                            //index = (int)(78.0 + (double)(7.0 * (double)((double)sub_index/(double)pls.size)));
-                            break;
-                        }
-                    }
-            }
-        }
-        
-        foreach (var smart_playlist in spls) {
-            GPod.Playlist p = iPodPlaylistHelper.get_gpod_playlist_from_smart_playlist (smart_playlist);
-
-            db.playlist_add((owned)p, -1);
-
-            ++sub_index;
-            //index = (int)(85.0 + (double)(5.0 * (double)((double)sub_index/(double)spls.size)));
-        }
-        db.spl_update_live();
-        
-        Idle.add( () => {
-            
-            return false;
-        });*/
-    }
-
     void cleanup_files(GLib.File music_folder, Gee.LinkedList<string> used_uris) {
         GLib.FileInfo file_info = null;
         try {

=== modified file 'plugins/Devices/iPod/iPodPlaylistHelper.vala'
--- plugins/Devices/iPod/iPodPlaylistHelper.vala	2015-02-26 16:44:26 +0000
+++ plugins/Devices/iPod/iPodPlaylistHelper.vala	2015-08-27 10:21:27 +0000
@@ -115,59 +115,57 @@
         message("adding rule\n");
         if (q.field == SmartQuery.FieldType.ALBUM) { // strings
             rule.field = GPod.SPLField.ALBUM;
-            rule.@string = q.value;
+            rule.@string = q.value.get_string ();
         } else if (q.field == SmartQuery.FieldType.ARTIST) {
             rule.field = GPod.SPLField.ARTIST;
-            rule.@string = q.value;
+            rule.@string = q.value.get_string ();
         } else if (q.field == SmartQuery.FieldType.COMPOSER) {
             rule.field = GPod.SPLField.COMPOSER;
-            rule.@string = q.value;
+            rule.@string = q.value.get_string ();
         } else if (q.field == SmartQuery.FieldType.COMMENT) {
             rule.field = GPod.SPLField.COMMENT;
-            rule.@string = q.value;
+            rule.@string = q.value.get_string ();
         } else if (q.field == SmartQuery.FieldType.GENRE) {
             rule.field = GPod.SPLField.GENRE;
-            rule.@string = q.value;
+            rule.@string = q.value.get_string ();
         } else if (q.field == SmartQuery.FieldType.GROUPING) {
             rule.field = GPod.SPLField.GROUPING;
-            rule.@string = q.value;
+            rule.@string = q.value.get_string ();
         } else if (q.field == SmartQuery.FieldType.TITLE) {
             rule.field = GPod.SPLField.SONG_NAME;
-            rule.@string = q.value;
+            rule.@string = q.value.get_string ();
         } else if (q.field == SmartQuery.FieldType.BITRATE) { // ints
             rule.field = GPod.SPLField.BITRATE;
-            rule.fromvalue = uint64.parse (q.value);
-            rule.tovalue = uint64.parse (q.value);
+            rule.fromvalue = (uint64)q.value.get_int ();
+            rule.tovalue = (uint64)q.value.get_int ();
         } else if (q.field == SmartQuery.FieldType.PLAYCOUNT) {
             rule.field = GPod.SPLField.PLAYCOUNT;
-            rule.fromvalue = uint64.parse (q.value);
-            rule.tovalue = uint64.parse (q.value);
+            rule.fromvalue =(uint64)q.value.get_int ();
+            rule.tovalue = (uint64)q.value.get_int ();
         } else if (q.field == SmartQuery.FieldType.SKIPCOUNT) {
             rule.field = GPod.SPLField.SKIPCOUNT;
-            rule.fromvalue = uint64.parse (q.value);
-            rule.tovalue = uint64.parse (q.value);
+            rule.fromvalue = (uint64)q.value.get_int ();
+            rule.tovalue = (uint64)q.value.get_int ();
         } else if (q.field == SmartQuery.FieldType.YEAR) {
             rule.field = GPod.SPLField.YEAR;
-            rule.fromvalue = uint64.parse (q.value);
-            rule.tovalue = uint64.parse (q.value);
+            rule.fromvalue = (uint64)q.value.get_int ();
+            rule.tovalue = (uint64)q.value.get_int ();
         } else if (q.field == SmartQuery.FieldType.LENGTH) {
             rule.field = GPod.SPLField.TIME;
-            rule.fromvalue = uint64.parse (q.value) * 1000;
-            rule.tovalue = uint64.parse (q.value) * 1000;
+            rule.fromvalue = (uint64)q.value.get_int () * 1000;
+            rule.tovalue = (uint64)q.value.get_int () * 1000;
         } else if (q.field == SmartQuery.FieldType.RATING) {
             rule.field = GPod.SPLField.RATING;
-            rule.fromvalue = uint64.parse (q.value) * 20;
-            rule.tovalue = uint64.parse (q.value) * 20;
+            rule.fromvalue = (uint64)q.value.get_int () * 20;
+            rule.tovalue = (uint64)q.value.get_int () * 20;
         } else if (q.field == SmartQuery.FieldType.DATE_ADDED) {
             rule.field = GPod.SPLField.DATE_ADDED;
-            rule.fromvalue = uint64.parse (q.value) * 1000;
-            rule.tovalue = uint64.parse (q.value) * 1000;
+            rule.fromvalue = (uint64)q.value.get_int () * 1000;
+            rule.tovalue = (uint64)q.value.get_int () * 1000;
         } else if (q.field == SmartQuery.FieldType.LAST_PLAYED) {
             rule.field = GPod.SPLField.LAST_PLAYED;
-            rule.fromvalue = uint64.parse (q.value) * 20;
-            rule.tovalue = uint64.parse (q.value) * 20;
-        } else if (q.field == SmartQuery.FieldType.DATE_RELEASED) {
-            // no equivalant
+            rule.fromvalue = (uint64)q.value.get_int () * 20;
+            rule.tovalue = (uint64)q.value.get_int () * 20;
         }
 /*
         else if (q.field == SmartQuery.FieldType.MEDIA_TYPE) {
@@ -220,108 +218,88 @@
             switch (field) {
             case SmartQuery.FieldType.ALBUM:
                 rule.field = GPod.SPLField.ALBUM;
-                rule.@string = value;
+                rule.@string = value.get_string ();
                 break;
             case SmartQuery.FieldType.ARTIST:
                 rule.field = GPod.SPLField.ARTIST;
-                rule.@string = value;
+                rule.@string = value.get_string ();
                 break;
             case SmartQuery.FieldType.COMPOSER:
                 rule.field = GPod.SPLField.COMPOSER;
-                rule.@string = value;
+                rule.@string = value.get_string ();
                 break;
             case SmartQuery.FieldType.COMMENT:
                 rule.field = GPod.SPLField.COMMENT;
-                rule.@string = value;
+                rule.@string = value.get_string ();
                 break;
             case SmartQuery.FieldType.GENRE:
                 rule.field = GPod.SPLField.GENRE;
-                rule.@string = value;
+                rule.@string = value.get_string ();
                 break;
             case SmartQuery.FieldType.GROUPING:
                 rule.field = GPod.SPLField.GROUPING;
-                rule.@string = value;
+                rule.@string = value.get_string ();
                 break;
             case SmartQuery.FieldType.TITLE:
                 rule.field = GPod.SPLField.SONG_NAME;
-                rule.@string = value;
+                rule.@string = value.get_string ();
                 break;
             case SmartQuery.FieldType.BITRATE:
                 rule.field = GPod.SPLField.BITRATE;
-                rule.fromvalue = uint64.parse (value);
-                rule.tovalue = uint64.parse (value);
+                rule.fromvalue = (uint64)value.get_int ();
+                rule.tovalue = (uint64)value.get_int ();
                 rule.tounits = 1;
                 rule.fromunits = 1;
                 break;
             case SmartQuery.FieldType.PLAYCOUNT:
                 rule.field = GPod.SPLField.PLAYCOUNT;
-                rule.fromvalue = uint64.parse (value);
-                rule.tovalue = uint64.parse (value);
+                rule.fromvalue = (uint64)value.get_int ();
+                rule.tovalue = (uint64)value.get_int ();
                 rule.tounits = 1;
                 rule.fromunits = 1;
                 break;
             case SmartQuery.FieldType.SKIPCOUNT:
                 rule.field = GPod.SPLField.SKIPCOUNT;
-                rule.fromvalue = uint64.parse (value);
-                rule.tovalue = uint64.parse (value);
+                rule.fromvalue = (uint64)value.get_int ();
+                rule.tovalue = (uint64)value.get_int ();
                 rule.tounits = 1;
                 break;
             case SmartQuery.FieldType.YEAR:
                 rule.field = GPod.SPLField.YEAR;
-                rule.fromvalue = uint64.parse (value);
-                rule.tovalue = uint64.parse (value);
+                rule.fromvalue = (uint64)value.get_int ();
+                rule.tovalue = (uint64)value.get_int ();
                 rule.tounits = 1;
                 rule.fromunits = 1;
                 break;
             case SmartQuery.FieldType.LENGTH:
                 rule.field = GPod.SPLField.TIME;
-                rule.fromvalue = uint64.parse (value) * 1000;
-                rule.tovalue = uint64.parse (value) * 1000;
+                rule.fromvalue = (uint64)value.get_int () * 1000;
+                rule.tovalue = (uint64)value.get_int () * 1000;
                 rule.tounits = 1;
                 rule.fromunits = 1;
                 break;
             case SmartQuery.FieldType.RATING:
-                message("rating rule is %s\n", value);
+                message("rating rule is %d\n", value.get_int ());
                 rule.field = GPod.SPLField.RATING;
-                rule.fromvalue = uint64.parse (value) * 20;
-                rule.tovalue = uint64.parse (value) * 20;
+                rule.fromvalue = (uint64)value.get_int () * 20;
+                rule.tovalue = (uint64)value.get_int () * 20;
                 rule.tounits = 1;//20;
                 rule.fromunits = 1;//20;
                 break;
             case SmartQuery.FieldType.DATE_ADDED:
                 rule.field = GPod.SPLField.DATE_ADDED;
-                rule.fromvalue = uint64.parse (value) * 60 * 60 * 24;
-                rule.tovalue = uint64.parse (value) * 60 * 60 * 24;
+                rule.fromvalue = (uint64)value.get_int () * 60 * 60 * 24;
+                rule.tovalue = (uint64)value.get_int () * 60 * 60 * 24;
                 rule.tounits = 1;//60 * 60 * 24;
                 rule.fromunits = 1;//60 * 60 * 24;
                 break;
             case SmartQuery.FieldType.LAST_PLAYED:
                 rule.field = GPod.SPLField.LAST_PLAYED;
-                rule.fromvalue = uint64.parse (value) * 60 * 60 * 24;
-                rule.tovalue = uint64.parse (value) * 60 * 60 * 24;
+                rule.fromvalue = (uint64)value.get_int () * 60 * 60 * 24;
+                rule.tovalue = (uint64)value.get_int () * 60 * 60 * 24;
                 rule.tounits = 1;//60 * 60 * 24;
                 rule.fromunits = 1;//60 * 60 * 24;
                 break;
-            case SmartQuery.FieldType.DATE_RELEASED:
-                // no equivelant
-                break;
-/*
-            case SmartQuery.FieldType.MEDIA_TYPE:
-                rule.field = GPod.SPLField.VIDEO_KIND;
-                if (value == "0") {
-                    message ("must be song\n");
-                    rule.fromvalue = 0x00000001;
-                    rule.tovalue = 0x00000001;;
-                } else if (value == "1") {
-                    rule.fromvalue = 0x00000006;
-                    rule.tovalue = 0x00000006;
-                    message ("must be podcast\n");
-                } else if (value == "2") {
-                    rule.fromvalue = 0x00000008;
-                    rule.tovalue = 0x00000008;
-                }
-                break;
-*/            
             }
 
             // set action type

=== modified file 'plugins/LastFM/Core.vala'
--- plugins/LastFM/Core.vala	2015-05-07 22:46:59 +0000
+++ plugins/LastFM/Core.vala	2015-08-27 10:21:27 +0000
@@ -45,11 +45,15 @@
         return core;
     }
 
+    private GLib.Cancellable fetch_cancellable;
+
     private Core () {
-        similarMedias = new LastFM.SimilarMedias();
+        fetch_cancellable = new GLib.Cancellable ();
+        similarMedias = new LastFM.SimilarMedias ();
         Noise.App.main_window.update_media_info.connect ((media) => {postNowPlaying (media);});
         Noise.App.main_window.media_half_played.connect ((media) => {postScrobbleTrack (media);});
         Noise.libraries_manager.local_library.media_imported.connect ((medias) => {fetch_albums_slowly.begin (medias);});
+        Noise.NotificationManager.get_default ().search_cover.connect ((m) => { get_album_infos.begin (m, fetch_cancellable);});
         similarMedias.similar_retrieved.connect(similar_retrieved_signal);
     }
 
@@ -126,22 +130,11 @@
                     albums.add (album_s);
                 if (!album_artist.contains (album_artist_s))
                     album_artist.add (album_artist_s);
-                fetch_album_info (media);
+                get_album_infos.begin (media, fetch_cancellable);
             }
         }
     }
 
-    public void fetch_album_info (Noise.Media media) {
-        try {
-            new Thread<void*>.try (null, () => {
-                get_album_infos (media);
-                return null;
-            });
-        } catch (GLib.Error err) {
-            warning ("ERROR: Could not create thread to have fun: %s", err.message);
-        }
-    }
-
     /** Update's the user's currently playing track on last.fm
      *
      */
@@ -188,7 +181,7 @@
     }
 
     public void fetchCurrentSimilarSongs () {
-        similarMedias.queryForSimilar (Noise.App.player.current_media);
+        similarMedias.query_for_similar (Noise.App.player.current_media);
     }
 
     private void similar_retrieved_signal (Gee.LinkedList<int> similarIDs, Gee.LinkedList<Noise.Media> similarDont) {
@@ -201,7 +194,7 @@
      * @param title The title of media to get similar to
      * @return The media that are similar
      */
-    public Gee.TreeSet<Noise.Media> getSimilarTracks(string title, string artist) {
+    public async Gee.TreeSet<Noise.Media> get_similar_tracks (string title, string artist, GLib.Cancellable cancellable) {
         var returned_medias = new Gee.TreeSet<Noise.Media> ();
         
         var uri = new Soup.URI (API_URL);
@@ -211,38 +204,42 @@
                                    "track", title,
                                    "format", "json");
         var session = new Soup.Session ();
-        var uri_request = session.request_uri (uri);
-
-        /* send the HTTP request */
-        var stream = uri_request.send ();
-        var parser = new Json.Parser ();
-        parser.load_from_stream (stream);
-        weak Json.Object parser_object = parser.get_root ().get_object ();
-        if (parser_object == null || parser_object.has_member ("similartracks") == false)
-            return returned_medias;
-
-        weak Json.Object similartracks = parser_object.get_object_member ("similartracks");
-        if (similartracks.has_member ("track") && similartracks.get_member ("track").get_node_type () == Json.NodeType.ARRAY) {
-            List<unowned Json.Node> similar_tracks_values = similartracks.get_array_member ("track").get_elements ();
-            foreach (unowned Json.Node element in similar_tracks_values) {
-                weak Json.Object track_object = element.get_object ();
-                var similar_to_add = new Noise.Media ("");
-                returned_medias.add (similar_to_add);
-                similar_to_add.title = track_object.get_string_member ("name");
-                if (track_object.has_member ("url"))
-                    similar_to_add.comment = track_object.get_string_member ("url");
-                if (track_object.has_member ("artist")) {
-                    weak Json.Object artist_object = track_object.get_object_member ("artist");
-                    if (artist_object.has_member ("name"))
-                        similar_to_add.artist = artist_object.get_string_member ("name");
+        try {
+            var uri_request = session.request_uri (uri);
+
+            /* send the HTTP request */
+            var stream = yield uri_request.send_async (cancellable);
+            var parser = new Json.Parser ();
+            parser.load_from_stream (stream);
+            weak Json.Object parser_object = parser.get_root ().get_object ();
+            if (parser_object == null || parser_object.has_member ("similartracks") == false)
+                return returned_medias;
+
+            weak Json.Object similartracks = parser_object.get_object_member ("similartracks");
+            if (similartracks.has_member ("track") && similartracks.get_member ("track").get_node_type () == Json.NodeType.ARRAY) {
+                List<unowned Json.Node> similar_tracks_values = similartracks.get_array_member ("track").get_elements ();
+                foreach (unowned Json.Node element in similar_tracks_values) {
+                    weak Json.Object track_object = element.get_object ();
+                    var similar_to_add = new Noise.Media ("");
+                    returned_medias.add (similar_to_add);
+                    similar_to_add.title = track_object.get_string_member ("name");
+                    if (track_object.has_member ("url"))
+                        similar_to_add.comment = track_object.get_string_member ("url");
+                    if (track_object.has_member ("artist")) {
+                        weak Json.Object artist_object = track_object.get_object_member ("artist");
+                        if (artist_object.has_member ("name"))
+                            similar_to_add.artist = artist_object.get_string_member ("name");
+                    }
                 }
             }
+        } catch (Error e) {
+            critical (e.message);
         }
 
         return returned_medias;
     }
 
-    public void get_album_infos (Noise.Media m) {
+    public async void get_album_infos (Noise.Media m, Cancellable cancellable) {
         var uri = new Soup.URI (API_URL);
         uri.set_query_from_fields ("method", "album.getinfo",
                                    "api_key", api_key,
@@ -250,48 +247,52 @@
                                    "album", m.album,
                                    "format", "json");
         var session = new Soup.Session ();
-        var uri_request = session.request_uri (uri);
-
-        /* send the HTTP request */
-        var stream = uri_request.send ();
-        var parser = new Json.Parser ();
-        parser.load_from_stream (stream);
-        weak Json.Object parser_object = parser.get_root ().get_object ();
-        if (parser_object == null || parser_object.has_member ("album") == false)
-            return;
-
-        weak Json.Object album_object = parser_object.get_member ("album").get_object ();
-        if (album_object.has_member ("image") && album_object.get_member ("image").get_node_type () == Json.NodeType.ARRAY) {
-            List<unowned Json.Node> image_values = album_object.get_array_member ("image").get_elements ();
-            string image_url = "";
-            string image_size = "";
-            foreach (unowned Json.Node element in image_values) {
-                weak Json.Object image_object = element.get_object ();
-                unowned string new_size = image_object.get_string_member ("size");
-                if (new_size == "mega" ||
-                    (new_size == "extralarge" && image_size != "mega") ||
-                    (new_size == "large" && image_size != "mega" && image_size != "extralarge")) {
-                    image_url = image_object.get_string_member ("#text").dup ();
-                    image_size = new_size.dup ();
-                }
-            }
-
-            var coverart_cache = Noise.CoverartCache.instance;
-            if (image_url != "" && coverart_cache.has_image (m) == false) {
-
-                debug ("Caching last.fm image from URL: %s", image_url);
-                var image_file = File.new_for_uri (image_url);
-                coverart_cache.cache_image_from_file_async.begin (m, image_file);
-            }
-        }
-
-        if (album_object.has_member ("releasedate") && m.year == 0) {
-            var releasedate = album_object.get_string_member ("releasedate");
-            var date = Date ();
-            date.set_parse (releasedate);
-            if (date.valid ()) {
-                m.year = date.get_year ();
-            }
+        try {
+            var uri_request = session.request_uri (uri);
+
+            /* send the HTTP request */
+            var stream = yield uri_request.send_async (cancellable);
+            var parser = new Json.Parser ();
+            parser.load_from_stream (stream);
+            weak Json.Object parser_object = parser.get_root ().get_object ();
+            if (parser_object == null || parser_object.has_member ("album") == false)
+                return;
+
+            weak Json.Object album_object = parser_object.get_member ("album").get_object ();
+            if (album_object.has_member ("image") && album_object.get_member ("image").get_node_type () == Json.NodeType.ARRAY) {
+                List<unowned Json.Node> image_values = album_object.get_array_member ("image").get_elements ();
+                string image_url = "";
+                string image_size = "";
+                foreach (unowned Json.Node element in image_values) {
+                    weak Json.Object image_object = element.get_object ();
+                    unowned string new_size = image_object.get_string_member ("size");
+                    if (new_size == "mega" ||
+                        (new_size == "extralarge" && image_size != "mega") ||
+                        (new_size == "large" && image_size != "mega" && image_size != "extralarge")) {
+                        image_url = image_object.get_string_member ("#text").dup ();
+                        image_size = new_size.dup ();
+                    }
+                }
+
+                var coverart_cache = Noise.CoverartCache.instance;
+                if (image_url != "" && coverart_cache.has_image (m) == false) {
+
+                    debug ("Caching last.fm image from URL: %s", image_url);
+                    var image_file = File.new_for_uri (image_url);
+                    coverart_cache.cache_image_from_file_async.begin (m, image_file);
+                }
+            }
+
+            if (album_object.has_member ("releasedate") && m.year == 0) {
+                var releasedate = album_object.get_string_member ("releasedate");
+                var date = Date ();
+                date.set_parse (releasedate);
+                if (date.valid ()) {
+                    m.year = date.get_year ();
+                }
+            }
+        } catch (Error e) {
+            critical (e.message);
         }
     }
 

=== modified file 'plugins/LastFM/LastFM.vala'
--- plugins/LastFM/LastFM.vala	2015-06-12 16:10:33 +0000
+++ plugins/LastFM/LastFM.vala	2015-08-27 10:21:27 +0000
@@ -86,7 +86,7 @@
                     var core = LastFM.Core.get_default ();
                     core.initialize (client_id, client_secret, token);
                     App.main_window.source_list_added.connect (source_list_added);
-                    libraries_manager.local_library.add_playlist (core.get_similar_playlist ());
+                    libraries_manager.add_headless_playlist (core.get_similar_playlist ());
                     similar_media_widget = new Noise.SimilarMediasWidget (core);
                     added_view = true;
                 } catch (Error e) {

=== modified file 'plugins/LastFM/SimilarMedia.vala'
--- plugins/LastFM/SimilarMedia.vala	2015-05-07 22:46:59 +0000
+++ plugins/LastFM/SimilarMedia.vala	2015-08-27 10:21:27 +0000
@@ -26,59 +26,52 @@
 public class LastFM.SimilarMedias : Object {
     public static const int MAX_FETCHED = 20;
 
-    bool working;
+    public signal void similar_retrieved (Gee.LinkedList<int64?> similarIDs, Gee.LinkedList<Noise.Media> similarDont);
 
     public Noise.StaticPlaylist similar_playlist;
-    private Gee.LinkedList<Noise.Media> similar_medias;
-
-    public signal void similar_retrieved (Gee.LinkedList<int> similarIDs, Gee.LinkedList<Noise.Media> similarDont);
+    private GLib.Cancellable cancellable;
 
     public class SimilarMedias () {
-        working = false;
-        similar_medias = new Gee.LinkedList<Noise.Media> ();
+        cancellable = new GLib.Cancellable ();
         similar_playlist = new Noise.StaticPlaylist ();
         similar_playlist.name = _("Similar");
         similar_playlist.read_only = true;
         similar_playlist.show_badge = true;
-        try {
-            similar_playlist.icon = GLib.Icon.new_for_string ("playlist-similar");
-        } catch (GLib.Error e) {
-            critical (e.message);
-        }
-        
+        similar_playlist.icon = new GLib.ThemedIcon ("playlist-similar");
+
         Noise.App.player.changing_player.connect ((m)=>{
-            lock (similar_medias) {
-                similar_medias.clear ();
-            }
             lock (similar_playlist) {
                 similar_playlist.clear ();
             }
         });
     }
-    
-    public virtual void queryForSimilar (Noise.Media s) {
-        
-        if (!working) {
-            working = true;
-            
-            similar_async (s);
+
+    public virtual void query_for_similar (Noise.Media s) {
+        if (cancellable.is_cancelled () == false) {
+            cancellable.cancel ();
         }
+
+        similar_async.begin (s);
     }
     
-    public void similar_async (Noise.Media s) {
+    public async void similar_async (Noise.Media s) {
         debug ("In the similar thread");
-        var similarIDs = new Gee.LinkedList<int> ();
+        cancellable.reset ();
+        var similar_medias = yield Core.get_default ().get_similar_tracks (s.title, s.artist, cancellable);
+        if (cancellable.is_cancelled ())
+            return;
+
+        var similarIDs = new Gee.LinkedList<int64?> ();
         var similarDont = new Gee.LinkedList<Noise.Media> ();
-        
-        similar_medias.add_all (Core.get_default ().getSimilarTracks (s.title, s.artist));
-        lock (similar_medias) {
-            Noise.libraries_manager.local_library.media_from_name (similar_medias, similarIDs, similarDont);
-        }
+        Noise.libraries_manager.local_library.media_from_name (similar_medias, similarIDs, similarDont);
+        if (cancellable.is_cancelled ())
+            return;
+
         similarIDs.offer_head (s.rowid);
-        
-        similar_playlist.add_medias (Noise.libraries_manager.local_library.medias_from_ids (similarIDs));
+        var found_medias = Noise.libraries_manager.local_library.medias_from_ids (similarIDs);
+        found_medias.remove (s);
+        similar_playlist.add_medias (found_medias);
         similar_retrieved (similarIDs, similarDont);
-        working = false;
     }
     
 }

=== modified file 'plugins/LastFM/SimilarMediaWidget.vala'
--- plugins/LastFM/SimilarMediaWidget.vala	2015-05-07 22:46:59 +0000
+++ plugins/LastFM/SimilarMediaWidget.vala	2015-08-27 10:21:27 +0000
@@ -35,14 +35,12 @@
         lfm.similar_retrieved.connect (similar_retrieved);
         
         App.main_window.update_media_info.connect ((m) => {
-            lfm.fetchCurrentSimilarSongs();
-            lfm.fetch_album_info (m);
+            lfm.fetchCurrentSimilarSongs ();
         });
         App.player.changing_player.connect ((m) => {
             similars_fetched = false;
             update_visibilities ();
         });
-        NotificationManager.get_default ().search_cover.connect ((m) => { lfm.fetch_album_info (m);});
         
         love_ban_buttons = new LoveBanButtons ();
         // put treeview inside scrolled window

=== modified file 'plugins/LastFM/noise-lastfm.application'
--- plugins/LastFM/noise-lastfm.application	2015-05-07 22:46:59 +0000
+++ plugins/LastFM/noise-lastfm.application	2015-08-27 10:21:27 +0000
@@ -3,6 +3,11 @@
   <description>Music</description>
   <desktop-entry>noise.desktop</desktop-entry>
   <translations>noise</translations>
+  <services>
+    <service id="lastfm-scrobble">
+      <description>Scrobble all your music</description>
+    </service>
+  </services>
   <service-types>
     <service-type id="scrobbling">
     </service-type>

=== modified file 'plugins/MPRIS/MPRIS.vala'
--- plugins/MPRIS/MPRIS.vala	2015-05-24 21:40:48 +0000
+++ plugins/MPRIS/MPRIS.vala	2015-08-27 10:21:27 +0000
@@ -232,7 +232,7 @@
     }
 
     private ObjectPath get_track_id (Noise.Media m) {
-        return new ObjectPath ("/org/pantheon/noise/Track/%d".printf (m.rowid));
+        return new ObjectPath ("/org/pantheon/noise/Track/%lld".printf (m.rowid));
     }
 
     private bool send_property_change() {

=== removed directory 'plugins/Zeitgeist'
=== removed file 'plugins/Zeitgeist/CMakeLists.txt'
--- plugins/Zeitgeist/CMakeLists.txt	2014-06-28 19:50:12 +0000
+++ plugins/Zeitgeist/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-pkg_check_modules(ZEITGEIST_DEPS zeitgeist-2.0)
-
-if (ZEITGEIST_DEPS_FOUND)
-
-set(DEPS_CFLAGS ${DEPS_CFLAGS} ${ZEITGEIST_DEPS_CFLAGS})
-set(DEPS_LIBRARIES ${DEPS_LIBRARIES} ${ZEITGEIST_DEPS_LIBRARIES})
-set(DEPS_LIBRARY_DIRS ${DEPS_LIBRARY_DIRS} ${ZEITGEIST_DEPS_LIBRARY_DIRS})
-
-add_definitions(${DEPS_CFLAGS})
-link_directories(${DEPS_LIBRARY_DIRS})
-
-set(TARGET_NAME zeitgeist)
-vala_precompile(ZEITGEIST_VALA_C ${TARGET_NAME}
-    Zeitgeist.vala
-PACKAGES
-    ${DEPS_PACKAGES}
-    zeitgeist-2.0
-OPTIONS
-    ${GLOBAL_VALAC_OPTIONS}
-)
-
-add_library(${TARGET_NAME} MODULE ${ZEITGEIST_VALA_C})
-
-target_link_libraries(${TARGET_NAME} ${DEPS_LIBRARIES})
-add_dependencies(${TARGET_NAME} ${SRC_TARGET})
-
-install(TARGETS ${TARGET_NAME} DESTINATION ${PLUGIN_DIR}/Zeitgeist/)
-install(FILES zeitgeist.plugin DESTINATION ${PLUGIN_DIR}/Zeitgeist/)
-
-else ()
-
-message("-- Zeitgeist plugin disabled")
-
-endif ()
\ No newline at end of file

=== removed file 'plugins/Zeitgeist/Zeitgeist.vala'
--- plugins/Zeitgeist/Zeitgeist.vala	2014-07-22 02:49:15 +0000
+++ plugins/Zeitgeist/Zeitgeist.vala	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-
-namespace Noise.Plugins {
-
-    public class ZeitgeistPlugin : Peas.ExtensionBase, Peas.Activatable {
-
-        public Object object { owned get; construct; }
-
-        Zeitgeist.Log zeitgeist;
-        PlaybackManager player;
-
-        Media? current_song = null;
-
-        bool connected = false;
-
-        public void activate () {
-            message ("Activating Zeitgeist plugin");
-
-            zeitgeist = Zeitgeist.Log.get_default ();
-
-            Value value = Value (typeof (Object));
-            get_property ("object", ref value);
-            var plugins = (Noise.Plugins.Interface) value.get_object();
-
-            plugins.register_function (Interface.Hook.WINDOW, () => {
-                connected = true;
-
-                player = Noise.App.player;
-                player.media_played.connect (media_changed);
-            });
-        }
-
-        public void deactivate () {
-            if (connected)
-                player.media_played.disconnect (media_changed);
-
-            connected = false;
-        }
-
-        void media_changed (Media played_media) {
-            if (current_song != null)
-                log_interaction.begin (current_song, Zeitgeist.ZG.LEAVE_EVENT);
-
-            log_interaction.begin (played_media, Zeitgeist.ZG.ACCESS_EVENT);
-            current_song = played_media;
-        }
-
-        async void log_interaction (Media song, string interpretation) {
-            var time = new DateTime.now_local ().to_unix () * 1000;
-
-            FileInfo? info = null;
-            try {
-                info = yield song.file.query_info_async (FileAttribute.STANDARD_CONTENT_TYPE, 0);
-            } catch (Error e) {}
-
-            var subject = new Zeitgeist.Subject ();
-            subject.uri = song.uri;
-            subject.interpretation = Zeitgeist.NFO.AUDIO;
-            subject.manifestation = Zeitgeist.NFO.FILE_DATA_OBJECT;
-            subject.origin = song.get_display_location ();
-            subject.mimetype = info != null ? info.get_content_type () : null;
-            subject.text = "%s - %s - %s".printf (song.get_display_title (),
-                    song.get_display_artist (), song.get_display_album ());
-
-            var event = new Zeitgeist.Event ();
-            event.timestamp = time;
-            event.interpretation = interpretation;
-            event.manifestation = Zeitgeist.ZG.USER_ACTIVITY;
-            event.actor = "application://noise.desktop";
-            event.add_subject (subject);
-
-            try {
-                zeitgeist.insert_event_no_reply (event);
-            } catch (Error e) {
-                warning ("Logging to zeitgeist failed: %s", e.message);
-            }
-        }
-
-        public void update_state () {
-        }
-    }
-}
-
-[ModuleInit]
-public void peas_register_types (TypeModule module) {
-    var objmodule = module as Peas.ObjectModule;
-    objmodule.register_extension_type (typeof (Peas.Activatable),
-            typeof (Noise.Plugins.ZeitgeistPlugin));
-}

=== removed file 'plugins/Zeitgeist/zeitgeist.plugin'
--- plugins/Zeitgeist/zeitgeist.plugin	2014-06-16 14:04:06 +0000
+++ plugins/Zeitgeist/zeitgeist.plugin	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Plugin]
-Module=zeitgeist
-IAge=2
-Name=Log to Zeitgeist
-Description=Log the played songs to Zeitgeist
-Authors=Noise Developers
-Copyright=Copyright © 2014 Noise Developers
-Website=http://launchpad.net/noise
-

=== modified file 'schemas/org.pantheon.noise.gschema.xml'
--- schemas/org.pantheon.noise.gschema.xml	2014-11-27 19:22:08 +0000
+++ schemas/org.pantheon.noise.gschema.xml	2015-08-27 10:21:27 +0000
@@ -51,12 +51,12 @@
       <summary>List of desktop shells for which the player's window will be minimized instead of hidden when the close-while-playing option is set to false.</summary>
       <description>For the Pantheon and GNOME desktop shells, the player's window is simply minimized due to the lack of a minimize button; the window is hidden for all the rest of desktop shells, unless they are added to this key. In fact, any dock-based shell should be part of this key, except those that lack a sound menu or in which the dock space is often limited (e.g. Unity). See the description of close-while-playing for more information.</description>
     </key>
-    <key type="i" name="last-playlist-playing">
-      <default>-1</default>
-      <summary>ID of last playlist playing</summary>
-      <description>ID of last playlist playing</description>
+    <key type="s" name="last-playlist-playing">
+      <default>''</default>
+      <summary>'s' for smart playlist or 'p' for static playlist + ID of last playlist playing</summary>
+      <description>'s' for smart playlist or 'p' for static playlist + ID of last playlist playing</description>
     </key>
-    <key type="i" name="last-media-playing">
+    <key type="x" name="last-media-playing">
       <default>0</default>
       <summary>ID of last media playing</summary>
       <description>ID of last media playing</description>

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-06-12 16:10:33 +0000
+++ src/CMakeLists.txt	2015-08-27 10:21:27 +0000
@@ -8,8 +8,12 @@
     Objects/MediaArtCache.vala
     Objects/CoverartCache.vala
     Objects/MediaKeyListener.vala
+    Objects/HistoryPlaylist.vala
     LocalBackend/LocalLibrary.vala
     LocalBackend/LocalMedia.vala
+    LocalBackend/LocalSmartPlaylist.vala
+    LocalBackend/LocalStaticPlaylist.vala
+    LocalBackend/DevicePreferences.vala
     Widgets/NavigationArrows.vala
     Widgets/TopDisplay.vala
     Widgets/InfoPanel.vala
@@ -30,9 +34,7 @@
     Widgets/FastView/FastGridModel.vala
     Widgets/FastView/FastList.vala
     Widgets/FastView/FastListModel.vala
-    DataBase/DataBaseManager.vala
-    DataBase/DataBaseUpdater.vala
-    DataBase/Tables.vala
+    DataBase.vala
     GStreamer/GStreamerTagger.vala
     GStreamer/Streamer.vala
     GStreamer/CoverImport.vala

=== removed directory 'src/DataBase'
=== renamed file 'src/DataBase/Tables.vala' => 'src/DataBase.vala'
--- src/DataBase/Tables.vala	2015-02-24 00:04:03 +0000
+++ src/DataBase.vala	2015-08-27 10:21:27 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /*-
- * Copyright (c) 2012 Noise Developers (http://launchpad.net/noise)
+ * Copyright (c) 2012-2015 Noise Developers (https://launchpad.net/noise)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -26,38 +26,270 @@
  * statement from your version.
  */
 
-namespace Noise.Database.Tables {
-
-public const string PLAYLISTS = """
-CREATE TABLE IF NOT EXISTS playlists (`name` TEXT, `media` TEXT,
-`sort_column_id` INT, `sort_direction` TEXT, `columns` TEXT)
-""";
-
-public const string SMART_PLAYLISTS = """
-CREATE TABLE IF NOT EXISTS smart_playlists (`name` TEXT, `and_or` INT, `queries` TEXT,
-`limit` INT, `limit_amount` INT)
-""";
-
-public const string COLUMNS = """
-CREATE TABLE IF NOT EXISTS columns (`is_smart` INT, `name` TEXT, `sort_column_id` INT, `sort_direction` TEXT,
-`columns` TEXT)
-""";
-
-public const string MEDIA = """
-CREATE TABLE IF NOT EXISTS media (`uri` TEXT, `file_size` INT, `title` TEXT,
-`artist` TEXT, `composer` TEXT, `album_artist` TEXT, `album` TEXT,
-`grouping` TEXT, `genre` TEXT,`comment` TEXT, `lyrics` TEXT, `has_embedded` INT,
-`year` INT, `track` INT, `track_count` INT, `album_number` INT,
-`album_count` INT, `bitrate` INT, `length` INT, `samplerate` INT, `rating` INT,
-`playcount` INT, `skipcount` INT, `dateadded` INT, `lastplayed` INT,
-`lastmodified` INT, `rowid` INTEGER PRIMARY KEY AUTOINCREMENT)
-""";
-
-public const string DEVICES = """
-CREATE TABLE IF NOT EXISTS devices (`unique_id` TEXT, `sync_when_mounted` INT,
-`sync_music` INT, `sync_podcasts` INT, `sync_audiobooks` INT, `sync_all_music` INT,
-`sync_all_podcasts` INT, `sync_all_audiobooks` INT, `music_playlist` STRING,
-`podcast_playlist` STRING, `audiobook_playlist` STRING, `last_sync_time` INT)
-""";
-
+namespace Noise.Database {
+    namespace Tables {
+        public const string PLAYLISTS = """CREATE TABLE IF NOT EXISTS playlists (name TEXT, media TEXT,
+            sort_column_id INT, sort_direction TEXT, columns TEXT, rowid INTEGER PRIMARY KEY AUTOINCREMENT)""";
+
+        public const string SMART_PLAYLISTS = """CREATE TABLE IF NOT EXISTS smart_playlists (name TEXT,
+            and_or INT, queries TEXT, limited INT, limit_amount INT, rowid INTEGER PRIMARY KEY AUTOINCREMENT)""";
+
+        public const string COLUMNS = """CREATE TABLE IF NOT EXISTS columns (unique_id TEXT, sort_column_id INT,
+            sort_direction INT, columns TEXT)""";
+
+        public const string MEDIA = """CREATE TABLE IF NOT EXISTS media (uri TEXT, file_size INT,
+            title TEXT, artist TEXT, composer TEXT, album_artist TEXT, album TEXT,
+            grouping TEXT, genre TEXT, comment TEXT, lyrics TEXT, has_embedded INT,
+            year INT, track INT, track_count INT, album_number INT,
+            album_count INT, bitrate INT, length INT, samplerate INT, rating INT,
+            playcount INT, skipcount INT, dateadded INT, lastplayed INT,
+            lastmodified INT, rowid INTEGER PRIMARY KEY AUTOINCREMENT)""";
+
+        public const string DEVICES = """CREATE TABLE IF NOT EXISTS devices (unique_id TEXT,
+            sync_when_mounted INT, sync_music INT, sync_all_music INT, music_playlist STRING,
+            last_sync_time INT)""";
+    }
+
+    /*
+     * NOTE:
+     * Update those constants when you change the order of columns.
+     */
+    namespace Playlists {
+        public static const string TABLE_NAME = "playlists";
+        public static const string NAME = "+0";
+        public static const string MEDIA = "+1";
+        public static const string SORT_COLUMN_ID = "+2";
+        public static const string SORT_DIRECTION = "+3";
+        public static const string COLUMNS = "+4";
+        public static const string ROWID = "+5";
+    }
+
+    namespace SmartPlaylists {
+        public static const string TABLE_NAME = "smart_playlists";
+        public static const string NAME = "+0";
+        public static const string AND_OR = "+1";
+        public static const string QUERIES = "+2";
+        public static const string LIMITED = "+3";
+        public static const string LIMIT_AMOUNT = "+4";
+        public static const string ROWID = "+5";
+    }
+
+    namespace Media {
+        public static const string TABLE_NAME = "media";
+        public static const string URI = "+0";
+        public static const string FILE_SIZE = "+1";
+        public static const string TITLE = "+2";
+        public static const string ARTIST = "+3";
+        public static const string COMPOSER = "+4";
+        public static const string ALBUM_ARTIST = "+5";
+        public static const string ALBUM = "+6";
+        public static const string GROUPING = "+7";
+        public static const string GENRE = "+8";
+        public static const string COMMENT = "+9";
+        public static const string LYRICS = "+10";
+        public static const string HAS_EMBEDDED = "+11";
+        public static const string YEAR = "+12";
+        public static const string TRACK = "+13";
+        public static const string TRACK_COUNT = "+14";
+        public static const string ALBUM_NUMBER = "+15";
+        public static const string ALBUM_COUNT = "+16";
+        public static const string BITRATE = "+17";
+        public static const string LENGTH = "+18";
+        public static const string SAMPLERATE = "+19";
+        public static const string RATING = "+20";
+        public static const string PLAYCOUNT = "+21";
+        public static const string SKIPCOUNT = "+22";
+        public static const string DATEADDED = "+23";
+        public static const string LASTPLAYED = "+24";
+        public static const string LASTMODIFIED = "+25";
+        public static const string ROWID = "+26";
+    }
+
+    namespace Devices {
+        public static const string TABLE_NAME = "devices";
+        public static const string UNIQUE_ID = "+0";
+        public static const string SYNC_WHEN_MOUNTED = "+1";
+        public static const string SYNC_MUSIC = "+2";
+        public static const string SYNC_ALL_MUSIC = "+3";
+        public static const string MUSIC_PLAYLIST = "+4";
+        public static const string LAST_SYNC_TIME = "+5";
+    }
+
+    namespace Columns {
+        public static const string TABLE_NAME = "columns";
+        public static const string UNIQUE_ID = "+0";
+        public static const string SORT_COLUMN_ID = "+1";
+        public static const string SORT_DIRECTION = "+2";
+        public static const string COLUMNS = "+3";
+    }
+
+    /*
+     * Helper functions.
+     */
+    public static Value make_string_value (string str) {
+        var val = Value (typeof(string));
+        val.set_string (str);
+        return val;
+    }
+
+    public static Value make_bool_value (bool bl) {
+        var val = Value (typeof(bool));
+        val.set_boolean (bl);
+        return val;
+    }
+
+    public static Value make_uint_value (uint u) {
+        var val = Value (typeof(uint));
+        val.set_uint (u);
+        return val;
+    }
+
+    public static Value make_int_value (int u) {
+        var val = Value (typeof(int));
+        val.set_int (u);
+        return val;
+    }
+
+    public static Value make_int64_value (int64 u) {
+        var val = Value (typeof(int64));
+        val.set_int64 (u);
+        return val;
+    }
+
+    public static Value make_uint64_value (uint64 u) {
+        var val = Value (typeof(uint64));
+        val.set_uint64 (u);
+        return val;
+    }
+
+    public static GLib.Value? query_field (int64 rowid, Gda.Connection connection, string table, string field) {
+        try {
+            var sql = new Gda.SqlBuilder (Gda.SqlStatementType.SELECT);
+            sql.select_add_target (table, null);
+            sql.add_field_value_id (sql.add_id (field), 0);
+            var id_field = sql.add_id ("rowid");
+            var id_param = sql.add_expr_value (null, Database.make_int64_value (rowid));
+            var id_cond = sql.add_cond (Gda.SqlOperatorType.EQ, id_field, id_param, 0);
+            sql.set_where (id_cond);
+            var data_model = connection.statement_execute_select (sql.get_statement (), null);
+            return data_model.get_value_at (data_model.get_column_index (field), 0);
+        } catch (Error e) {
+            critical ("Could not query field %s: %s", field, e.message);
+            return null;
+        }
+    }
+
+    public static void set_field (int64 rowid, Gda.Connection connection, string table, string field, GLib.Value value) {
+        try {
+            var rowid_value = GLib.Value (typeof (int64));
+            rowid_value.set_int64 (rowid);
+            var col_names = new GLib.SList<string> ();
+            col_names.append (field);
+            var values = new GLib.SList<GLib.Value?> ();
+            values.append (value);
+            connection.update_row_in_table_v (table, "rowid", rowid_value, col_names, values);
+        } catch (Error e) {
+            critical ("Could not set field %s: %s", field, e.message);
+        }
+    }
+
+    public static Gda.SqlBuilderId process_smart_query (Gda.SqlBuilder builder, SmartQuery sq) {
+        Value value = Value (sq.value.type ());
+        sq.value.copy (ref value);
+        string field;
+        switch (sq.field) {
+            case SmartQuery.FieldType.ALBUM:
+                field = "album";
+                break;
+            case SmartQuery.FieldType.ARTIST:
+                field = "artist";
+                break;
+            case SmartQuery.FieldType.BITRATE:
+                field = "bitrate";
+                break;
+            case SmartQuery.FieldType.COMMENT:
+                field = "comment";
+                break;
+            case SmartQuery.FieldType.COMPOSER:
+                field = "composer";
+                break;
+            case SmartQuery.FieldType.DATE_ADDED:
+                // We need the current timestamp because this field is relative.
+                value = Value (typeof (int));
+                value.set_int ((int)time_t ());
+                field = "dateadded";
+                break;
+            case SmartQuery.FieldType.GENRE:
+                field = "genre";
+                break;
+            case SmartQuery.FieldType.GROUPING:
+                field = "grouping";
+                break;
+            case SmartQuery.FieldType.LAST_PLAYED:
+                // We need the current timestamp because this field is relative.
+                value = Value (typeof (int));
+                value.set_int ((int)time_t ());
+                field = "lastplayed";
+                break;
+            case SmartQuery.FieldType.LENGTH:
+                field = "length";
+                break;
+            case SmartQuery.FieldType.PLAYCOUNT:
+                field = "playcount";
+                break;
+            case SmartQuery.FieldType.RATING:
+                field = "rating";
+                break;
+            case SmartQuery.FieldType.SKIPCOUNT:
+                field = "skipcount";
+                break;
+            case SmartQuery.FieldType.YEAR:
+                field = "year";
+                break;
+            case SmartQuery.FieldType.TITLE:
+            default:
+                field = "title";
+                break;
+        }
+
+        Gda.SqlOperatorType sql_operator_type;
+        switch (sq.comparator) {
+            case SmartQuery.ComparatorType.IS_NOT:
+                sql_operator_type = Gda.SqlOperatorType.NOT;
+                break;
+            case SmartQuery.ComparatorType.CONTAINS:
+            case SmartQuery.ComparatorType.NOT_CONTAINS:
+                value = make_string_value ("%" + value.get_string () + "%");
+                sql_operator_type = Gda.SqlOperatorType.LIKE;
+                break;
+            case SmartQuery.ComparatorType.IS_EXACTLY:
+                sql_operator_type = Gda.SqlOperatorType.EQ;
+                break;
+            case SmartQuery.ComparatorType.IS_AT_MOST:
+                sql_operator_type = Gda.SqlOperatorType.LEQ;
+                break;
+            case SmartQuery.ComparatorType.IS_AT_LEAST:
+                sql_operator_type = Gda.SqlOperatorType.GEQ;
+                break;
+            case SmartQuery.ComparatorType.IS_WITHIN:
+                sql_operator_type = Gda.SqlOperatorType.LEQ;
+                break;
+            case SmartQuery.ComparatorType.IS_BEFORE:
+                sql_operator_type = Gda.SqlOperatorType.GEQ;
+                break;
+            case SmartQuery.ComparatorType.IS:
+            default:
+                sql_operator_type = Gda.SqlOperatorType.LIKE;
+                break;
+        }
+
+        var id_field = builder.add_id (field);
+        var id_value = builder.add_expr_value (null, value);
+        if (sq.comparator == SmartQuery.ComparatorType.NOT_CONTAINS) {
+            var cond = builder.add_cond (sql_operator_type, id_field, id_value, 0);;
+            return builder.add_cond (Gda.SqlOperatorType.NOT, cond, 0, 0);
+        } else {
+            return builder.add_cond (sql_operator_type, id_field, id_value, 0);
+        }
+    }
 }

=== removed file 'src/DataBase/DataBaseManager.vala'
--- src/DataBase/DataBaseManager.vala	2015-02-26 17:15:44 +0000
+++ src/DataBase/DataBaseManager.vala	1970-01-01 00:00:00 +0000
@@ -1,937 +0,0 @@
-/*
- * Copyright (c) 2012 Noise Developers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authored by: Scott Ringwelski <[e-mail]>,
- *              Victor Eduardo <[e-mail]>
- */
-
-using SQLHeavy;
-
-public class Noise.DataBaseManager : GLib.Object {
-    public SQLHeavy.Database database;
-    private Transaction transaction; // the current sql transaction
-
-    private int index = 0;
-    private int item_count = 0;
-
-    private static DataBaseManager? dbm = null;
-
-    public static DataBaseManager get_default () {
-        if (dbm == null)
-            dbm = new DataBaseManager ();
-        return dbm;
-    }
-
-    /** Creates a new DatabaseManager **/
-    private DataBaseManager () {
-        init_database ();
-    }
-
-    /** Creates/Reads the database file and folder **/
-    private void init_database () {
-        assert (database == null);
-
-        var database_dir = FileUtils.get_data_directory ();
-
-        try {
-            database_dir.make_directory_with_parents (null);
-        }
-        catch (GLib.Error err) {
-            if (!(err is IOError.EXISTS))
-                error ("Could not create data directory: %s", err.message);
-        }
-
-        string database_path = Path.build_filename (database_dir.get_path (), "database_0_3_0.db");
-        var database_file = File.new_for_path (database_path);
-
-        bool new_db = !database_file.query_exists ();
-
-        try {
-            const SQLHeavy.FileMode flags = SQLHeavy.FileMode.READ
-                                            | SQLHeavy.FileMode.WRITE
-                                            | SQLHeavy.FileMode.CREATE;
-            database = new SQLHeavy.Database (database_file.get_path (), flags);
-        }
-        catch (SQLHeavy.Error err) {
-            error ("Could not read/create database file: %s", err.message);
-        }
-
-        // Disable synchronized commits for performance reasons
-        database.synchronous = SQLHeavy.SynchronousMode.OFF;
-
-        load_table (Database.Tables.PLAYLISTS);
-        load_table (Database.Tables.SMART_PLAYLISTS);
-        load_table (Database.Tables.COLUMNS);
-        load_table (Database.Tables.MEDIA);
-        load_table (Database.Tables.DEVICES);
-
-        if (new_db)
-            add_default_smart_playlists ();
-    }
-
-    private void load_table (string table) {
-        try {
-            database.execute (table);
-        }
-        catch (SQLHeavy.Error err) {
-            warning ("Error while executing %s: %s", table, err.message);
-        }
-    }
-
-    public void resetProgress (int items) {
-        index = 0;
-        item_count = items;
-    }
-
-    /**
-     * Loads media from db
-     */
-    public Gee.TreeSet<LocalMedia> load_media () {
-        assert (database != null);
-        var rv = new Gee.TreeSet<LocalMedia>();
-
-        try {
-            Query query = new Query (database, "SELECT `rowid` FROM `media`");
-            for (var results = query.execute (); !results.finished; results.next()) {
-                var m = new LocalMedia (results.fetch_int ());
-                rv.add (m);
-            }
-        }
-        catch (SQLHeavy.Error err) {
-            warning ("Could not load media from db: %s\n", err.message);
-        }
-
-        return rv;
-    }
-
-    public void clear_media () {
-        assert (database != null);
-        try {
-            database.execute ("DELETE FROM `media`");
-        }
-        catch(SQLHeavy.Error err) {
-            warning ("Could not clear media: %s \n", err.message);
-        }
-    }
-
-    public Gee.TreeSet<LocalMedia> add_media (Gee.Collection<Media> media) {
-        assert (database != null);
-        var tree_set = new Gee.TreeSet<LocalMedia> ();
-        try {
-            Query query = new Query (database, """INSERT INTO `media` (`uri`, `file_size`, `title`, `artist`, `composer`, `album_artist`,
-`album`, `grouping`, `genre`, `comment`, `lyrics`, `has_embedded`, `year`, `track`, `track_count`, `album_number`, `album_count`,
-`bitrate`, `length`, `samplerate`, `rating`, `playcount`, `skipcount`, `dateadded`, `lastplayed`, `lastmodified`)
-VALUES (:uri, :file_size, :title, :artist, :composer, :album_artist, :album, :grouping,
-:genre, :comment, :lyrics, :has_embedded, :year, :track, :track_count, :album_number, :album_count, :bitrate, :length, :samplerate,
-:rating, :playcount, :skipcount, :dateadded, :lastplayed, :lastmodified);""");
-
-            foreach (var s in media) {
-                if (!s.isTemporary) {
-                    query.set_string(":uri", s.uri);
-                    query.set_int(":file_size", (int)s.file_size);
-                    query.set_string(":title", s.title);
-                    query.set_string(":artist", s.artist);
-                    query.set_string(":composer", s.composer);
-                    query.set_string(":album_artist", s.album_artist);
-                    query.set_string(":album", s.album);
-                    query.set_string(":grouping", s.grouping);
-                    query.set_string(":genre", s.genre);
-                    query.set_string(":comment", s.comment);
-                    query.set_string(":lyrics", s.lyrics);
-                    query.set_int(":has_embedded", s.has_embedded ? 1 : 0);
-                    query.set_int(":year", (int)s.year);
-                    query.set_int(":track", (int)s.track);
-                    query.set_int(":track_count", (int)s.track_count);
-                    query.set_int(":album_number", (int)s.album_number);
-                    query.set_int(":album_count", (int)s.album_count);
-                    query.set_int(":bitrate", (int)s.bitrate);
-                    query.set_int(":length", (int)s.length);
-                    query.set_int(":samplerate", (int)s.samplerate);
-                    query.set_int(":rating", (int)s.rating);
-                    query.set_int(":playcount", (int)s.play_count);
-                    query.set_int(":skipcount", (int)s.skip_count);
-                    query.set_int(":dateadded", (int)s.date_added);
-                    query.set_int(":lastplayed", (int)s.last_played);
-                    query.set_int(":lastmodified", (int)s.last_modified);
-                    query.execute ();
-                    var local_media = new LocalMedia ((int)database.last_insert_id);
-                    tree_set.add (local_media);
-                }
-            }
-        }
-        catch (SQLHeavy.Error err) {
-            warning ("Could not save media: %s \n", err.message);
-        }
-        return tree_set;
-    }
-
-    public void remove_media (Gee.Collection<Media> media) {
-        assert (database != null);
-        try {
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare ("DELETE FROM `media` WHERE rowid=:rowid");
-
-            foreach (var m in media) {
-                query.set_int (":rowid", m.rowid);
-                query.execute ();
-            }
-
-            transaction.commit ();
-        }
-        catch (SQLHeavy.Error err) {
-            warning ("Could not remove media from db: %s\n", err.message);
-        }
-    }
-
-    /** COLUMNS STATE **
-     * load_columns_state() loads the state of each columns from db
-     *
-     */
-    public Gee.HashMap<Playlist, TreeViewSetup> load_columns_state () {
-        debug ("load columns");
-        assert (database != null);
-        var rv = new Gee.HashMap<Playlist, TreeViewSetup>();
-
-        try {
-            string script = "SELECT * FROM `columns`";
-            Query query = new Query(database, script);
-
-            for (var results = query.execute(); !results.finished; results.next() ) {
-                if (results.fetch_int(0) == 0) {
-                    StaticPlaylist p = libraries_manager.local_library.playlist_from_name (results.fetch_string(1));
-                    var tvs = new TreeViewSetup (results.fetch_int(2), Gtk.SortType.ASCENDING, ViewWrapper.Hint.PLAYLIST);
-                    tvs.set_sort_direction_from_string(results.fetch_string(3));
-                    tvs.import_columns(results.fetch_string(4));
-                    rv.set (p, tvs);
-                } else {
-                    SmartPlaylist p = libraries_manager.local_library.smart_playlist_from_name (results.fetch_string(1));
-                    var tvs = new TreeViewSetup (results.fetch_int(2), Gtk.SortType.ASCENDING, ViewWrapper.Hint.SMART_PLAYLIST);
-                    tvs.set_sort_direction_from_string(results.fetch_string(3));
-                    tvs.import_columns(results.fetch_string(4));
-                    rv.set (p, tvs);
-                }
-            }
-        }
-        catch (SQLHeavy.Error err) {
-            warning ("Could not load columns from db: %s\n", err.message);
-        }
-
-        return rv;
-    }
-
-    public void save_columns_state (Gee.Collection<StaticPlaylist>? playlists = null, Gee.Collection<SmartPlaylist>? smart_playlists = null) {
-        debug ("save columns");
-        assert (database != null);
-        try {
-            database.execute("DELETE FROM `columns`");
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare ("""INSERT INTO `columns` (`is_smart`, `name`, `sort_column_id`, `sort_direction`, `columns`) 
-                                                VALUES (:is_smart, :name, :sort_column_id, :sort_direction, :columns);""");
-
-            if (playlists != null) {
-                foreach(StaticPlaylist p in playlists) {
-                    if (p.read_only == false) {
-                        var tvs = App.main_window.get_treeviewsetup_from_playlist (p);
-                        
-                        query.set_int    (":is_smart", 0);
-                        query.set_string (":name", p.name);
-                        query.set_int    (":sort_column_id", tvs.sort_column_id);
-                        query.set_string (":sort_direction", tvs.sort_direction_to_string());
-                        query.set_string (":columns", tvs.columns_to_string());
-
-                        query.execute();
-                    }
-                }
-            }
-            
-            if (smart_playlists != null) {
-                foreach(SmartPlaylist p in smart_playlists) {
-                    var tvs = App.main_window.get_treeviewsetup_from_playlist (p);
-                    
-                    query.set_int    (":is_smart", 1);
-                    query.set_string (":name", p.name);
-                    query.set_int    (":sort_column_id", tvs.sort_column_id);
-                    query.set_string (":sort_direction", tvs.sort_direction_to_string());
-                    query.set_string (":columns", tvs.columns_to_string());
-
-                    query.execute();
-                }
-            }
-
-            transaction.commit();
-        }
-        catch(SQLHeavy.Error err) {
-            warning ("Could not save playlists: %s \n", err.message);
-        }
-    }
-
-    public void add_columns_state (StaticPlaylist? p = null, SmartPlaylist? sp = null) {
-        debug ("add columns");
-        assert (database != null);
-        
-        string name = "";
-        int is_smart = 0;
-        TreeViewSetup tvs;
-        if (sp == null) {
-            if (p == null)
-                return;
-            if (p.read_only == true)
-                return;
-            name = p.name;
-            tvs = App.main_window.get_treeviewsetup_from_playlist (p);
-        } else {
-            if (sp == null)
-                return;
-            is_smart = 1;
-            name = sp.name;
-            tvs = App.main_window.get_treeviewsetup_from_playlist (sp);
-        }
-
-        try {
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare ("""INSERT INTO `columns` (`is_smart`, `name`, `sort_column_id`, `sort_direction`, `columns`) 
-                                                VALUES (:is_smart, :name, :sort_column_id, :sort_direction, :columns);""");
-            
-            query.set_int    (":is_smart", is_smart);
-            query.set_string (":name", name);
-            query.set_int    (":sort_column_id", tvs.sort_column_id);
-            query.set_string (":sort_direction", tvs.sort_direction_to_string());
-            query.set_string (":columns", tvs.columns_to_string());
-            query.execute();
-            
-            transaction.commit();
-        }
-        catch(SQLHeavy.Error err) {
-            warning ("Could not add columns: %s \n", err.message);
-        }
-    }
-
-    public void remove_columns_state (StaticPlaylist? p = null, SmartPlaylist? sp = null) {
-        debug ("remove columns");
-        assert (database != null);
-        
-        string name = "";
-        if (sp == null) {
-            if (p == null)
-                return;
-            if (p.read_only == true)
-                return;
-            name = p.name;
-        } else {
-            if (sp == null)
-                return;
-            name = sp.name;
-        }
-        try {
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare("""DELETE FROM `columns` WHERE name=:name""");
-
-            query.set_string(":name", name);
-            query.execute();
-
-            transaction.commit();
-        }
-        catch (SQLHeavy.Error err) {
-            warning ("Could not remove column from db: %s\n", err.message);
-        }
-    }
-
-    public void add_default_columns () {
-        assert (database != null);
-        try {
-            
-            TreeViewSetup tvs = new TreeViewSetup (ListColumn.ARTIST, Gtk.SortType.ASCENDING, ViewWrapper.Hint.SMART_PLAYLIST);
-            
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare ("""INSERT INTO `columns` (`is_smart`, `name`, `sort_column_id`, `sort_direction`, `columns`) 
-                                                VALUES (:is_smart, :name, :sort_column_id, :sort_direction, :columns);""");
-
-            query.set_int    (":is_smart", 1);
-            query.set_string (":name", _("Favorite Songs"));
-            query.set_int    (":sort_column_id", ListColumn.RATING);
-            query.set_string (":sort_direction", tvs.sort_direction_to_string ());
-            query.set_string (":columns", tvs.columns_to_string ());
-            query.execute ();
-
-            query.set_int    (":is_smart", 1);
-            query.set_string (":name", _("Recently Added"));
-            query.set_int    (":sort_column_id", ListColumn.ARTIST);
-            query.set_string (":sort_direction", tvs.sort_direction_to_string ());
-            query.set_string (":columns", tvs.columns_to_string ());
-            query.execute ();
-
-            /*
-            query.set_int    (":is_smart", 1);
-            query.set_string (":name", _("Recently Played"));
-            query.set_int    (":sort_column_id", ListColumn.LAST_PLAYED);
-            query.set_string (":sort_direction", tvs.sort_direction_to_string ());
-            query.set_string (":columns", tvs.columns_to_string ());
-            query.execute ();
-            */
-
-            query.set_int    (":is_smart", 1);
-            query.set_string (":name", _("Recent Favorites"));
-            query.set_int    (":sort_column_id", ListColumn.RATING);
-            query.set_string (":sort_direction", tvs.sort_direction_to_string ());
-            query.set_string (":columns", tvs.columns_to_string ());
-            query.execute ();
-
-            query.set_int    (":is_smart", 1);
-            query.set_string (":name", _("Never Played"));
-            query.set_int    (":sort_column_id", ListColumn.ARTIST);
-            query.set_string (":sort_direction", tvs.sort_direction_to_string ());
-            query.set_string (":columns", tvs.columns_to_string ());
-            query.execute ();
-
-            query.set_int    (":is_smart", 1);
-            query.set_string (":name", _("Over Played"));
-            query.set_int    (":sort_column_id", ListColumn.PLAY_COUNT);
-            query.set_string (":sort_direction", tvs.sort_direction_to_string ());
-            query.set_string (":columns", tvs.columns_to_string ());
-            query.execute ();
-
-            query.set_int    (":is_smart", 1);
-            query.set_string (":name", _("Not Recently Played"));
-            query.set_int    (":sort_column_id", ListColumn.NUMBER);
-            query.set_string (":sort_direction", tvs.sort_direction_to_string ());
-            query.set_string (":columns", tvs.columns_to_string ());
-            query.execute ();
-
-            transaction.commit();
-        }
-        catch (SQLHeavy.Error err) {
-            warning ("Could not initialize columns: %s\n", err.message);
-        }
-    }
-
-    /** PLAYLISTS **
-     * load_playlists() loads playlists from db
-     *
-     * playlist_from_id loads playlist of given rowid
-     *
-     * playlist_from_name() loads playlsit given a name
-     */
-    public Gee.ArrayList<StaticPlaylist> load_playlists () {
-        var rv = new Gee.ArrayList<StaticPlaylist>();
-        assert (database != null);
-
-        try {
-            string script = "SELECT * FROM `playlists`";
-            Query query = new Query(database, script);
-
-            for (var results = query.execute(); !results.finished; results.next() ) {
-                var p = new StaticPlaylist.with_info(0, results.fetch_string(0));
-                
-                string media = results.fetch_string(1);
-                
-                string[] media_strings = media.split("<sep>", 0);
-                int index;
-                var uris = new Gee.LinkedList<string> ();
-                for (index = 0; index < media_strings.length - 1; ++index) {
-                    uris.add (media_strings[index]);
-                }
-                p.add_medias (libraries_manager.local_library.medias_from_uris (uris));
-
-                if (!rv.contains (p))
-                    rv.add(p);
-            }
-        }
-        catch (SQLHeavy.Error err) {
-            warning ("Could not load playlists from db: %s\n", err.message);
-        }
-
-        return rv;
-    }
-
-    public void save_playlists (Gee.Collection<StaticPlaylist> playlists) {
-        assert (database != null);
-        try {
-            database.execute("DELETE FROM `playlists`");
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare ("INSERT INTO `playlists` (`name`, `media`) VALUES (:name, :media);");
-
-            foreach (var p in playlists) {
-                if (p.read_only == false || p.name == C_("Name of the playlist", "Queue") || p.name == _("History")) {
-                    string rv = "";
-                    
-                    foreach (var m in p.medias) {
-                        if (m != null)
-                            rv += m.uri + "<sep>";
-                    }
-                    query.set_string(":name", p.name);
-                    query.set_string(":media", rv);
-
-                    query.execute();
-                }
-            }
-
-            transaction.commit();
-        }
-        catch(SQLHeavy.Error err) {
-            warning ("Could not save playlists: %s \n", err.message);
-        }
-    }
-
-    public void save_playlist (StaticPlaylist p, string? old_name = null) {
-        assert (database != null);
-        try {
-            if (p.read_only == true)
-                return;
-            
-            if (old_name == null) {
-                remove_playlist (p);
-            } else {
-                var pl = new StaticPlaylist.with_info (0, old_name);
-                remove_playlist (pl);
-            }
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare ("INSERT INTO `playlists` (`name`, `media`) VALUES (:name, :media);");
-
-            string rv = "";
-            
-            foreach (var m in p.medias) {
-                if (m != null)
-                    rv += m.uri + "<sep>";
-            }
-            query.set_string(":name", p.name);
-            query.set_string(":media", rv);
-
-            query.execute();
-
-            transaction.commit();
-        }
-        catch(SQLHeavy.Error err) {
-            warning ("Could not save playlists: %s \n", err.message);
-        }
-    }
-
-    public void add_playlist (StaticPlaylist p) {
-        assert (database != null);
-        if (p.read_only == true)
-            return;
-        string rv = "";
-        
-        foreach (var m in p.medias) {
-            if (m != null)
-                rv += m.uri + "<sep>";
-        }
-
-        try {
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare ("""INSERT INTO `playlists` (`name`, `media`)
-                                                VALUES (:name, :media);""");
-
-            query.set_string(":name", p.name);
-            query.set_string(":media", rv);
-
-            query.execute();
-
-            transaction.commit();
-        
-            debug ("playlist %s stored into database", p.name);
-        }
-        catch(SQLHeavy.Error err) {
-            warning ("Could not add playlists: %s \n", err.message);
-        }
-    }
-
-    /*public void update_playlists(LinkedList<StaticPlaylist> playlists) {
-        try {
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare("UPDATE `playlists` SET name=:name, media=:media, sort_column_id=:sort_column_id, sort_direction=:sort_direction, columns=:columns  WHERE name=:name");
-
-            foreach (var p in playlists) {
-                query.set_string(":name", p.name);
-                query.set_string(":media", p.media_to_string(App.library_manager));
-                query.set_int(":sort_column_id", p.tvs.sort_column_id);
-                query.set_string(":sort_direction", p.tvs.sort_direction_to_string());
-                query.set_string(":columns", p.tvs.columns_to_string());
-
-                query.execute();
-            }
-
-            transaction.commit();
-        }
-        catch(SQLHeavy.Error err) {
-            warning ("Could not update playlist: %s \n", err.message);
-        }
-    }*/
-
-    public void remove_playlist (StaticPlaylist p) {
-        assert (database != null);
-        if (p.read_only == true)
-            return;
-        try {
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare("""DELETE FROM `playlists` WHERE name=:name""");
-
-            query.set_string(":name", p.name);
-            query.execute();
-
-            transaction.commit();
-        }
-        catch (SQLHeavy.Error err) {
-            warning ("Could not remove playlist from db: %s\n", err.message);
-        }
-    }
-
-    /** SMART PLAYLISTS **/
-
-    private static const string QUERY_SEPARATOR = "<query_sep>";
-    private static const string VALUE_SEPARATOR = "<val_sep>";
-
-    /** temp_playlist should be in format of #,#,#,#,#, **/
-    public static Gee.LinkedList<SmartQuery> queries_from_string (string q) {
-        string[] queries_in_string = q.split(QUERY_SEPARATOR, 0);
-        int index;
-
-        var queries = new Gee.LinkedList<SmartQuery> ();
-        for(index = 0; index < queries_in_string.length - 1; index++) {
-            string[] pieces_of_query = queries_in_string[index].split(VALUE_SEPARATOR, 3);
-            pieces_of_query.resize (3);
-
-            SmartQuery sq = new SmartQuery();
-            sq.field = (SmartQuery.FieldType)int.parse(pieces_of_query[0]);
-            sq.comparator = (SmartQuery.ComparatorType)int.parse(pieces_of_query[1]);
-            sq.value = pieces_of_query[2];
-
-            queries.add (sq);
-        }
-
-        return queries;
-    }
-
-    // FIXME: This is an implementation detail and should not be present in the core.
-    public static string queries_to_string (Gee.Collection<SmartQuery> queries) {
-        string rv = "";
-        foreach (SmartQuery q in queries) {
-            rv += ((int)q.field).to_string () + VALUE_SEPARATOR + ((int)q.comparator).to_string() + VALUE_SEPARATOR + q.value + QUERY_SEPARATOR;
-        }
-
-        return rv;
-    }
-
-    public void add_default_smart_playlists () {
-        assert (database != null);
-        try {
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare ("""INSERT INTO `smart_playlists` (`name`, `and_or`, `queries`, `limit`, `limit_amount`) VALUES (:name, :and_or, :queries, :limit, :limit_amount);""");
-
-            query.set_string(":name", _("Favorite Songs"));
-            query.set_int(":and_or", 1);
-            query.set_string(":queries", "11<val_sep>2<val_sep>4<query_sep>13<val_sep>0<val_sep>0<query_sep>12<val_sep>6<val_sep>3<query_sep>");
-            query.set_int(":limit", 1);
-            query.set_int(":limit_amount", 50);
-            query.execute();
-
-            query.set_string(":name", _("Recently Added"));
-            query.set_int(":and_or", 1);
-            query.set_string(":queries", "5<val_sep>7<val_sep>7<query_sep>");
-            query.set_int(":limit", 1);
-            query.set_int(":limit_amount", 50);
-            query.execute();
-
-            /*
-            query.set_string(":name", _("Recently Played"));
-            query.set_int(":and_or", 1);
-            query.set_string(":queries", "9<val_sep>7<val_sep>7<query_sep>");
-            query.set_int(":limit", 0);
-            query.set_int(":limit_amount", 50);
-            query.execute();
-            */
-
-            query.set_string(":name", _("Recent Favorites"));
-            query.set_int(":and_or", 1);
-            query.set_string(":queries", "11<val_sep>2<val_sep>4<query_sep>13<val_sep>0<val_sep>0<query_sep>9<val_sep>7<val_sep>7<query_sep>");
-            query.set_int(":limit", 1);
-            query.set_int(":limit_amount", 50);
-            query.execute();
-
-            query.set_string(":name", _("Never Played"));
-            query.set_int(":and_or", 0);
-            query.set_string(":queries", "11<val_sep>0<val_sep>0<query_sep>");
-            query.set_int(":limit", 1);
-            query.set_int(":limit_amount", 50);
-            query.execute();
-
-            query.set_string(":name", _("Over Played"));
-            query.set_int(":and_or", 1);
-            query.set_string(":queries", "11<val_sep>4<val_sep>10<query_sep>");
-            query.set_int(":limit", 1);
-            query.set_int(":limit_amount", 50);
-            query.execute();
-
-            query.set_string(":name", _("Not Recently Played"));
-            query.set_int(":and_or", 1);
-            query.set_string(":queries", "9<val_sep>8<val_sep>7<query_sep>");
-            query.set_int(":limit", 1);
-            query.set_int(":limit_amount", 50);
-            query.execute();
-
-            transaction.commit();
-        }
-        catch (SQLHeavy.Error err) {
-            warning ("Could not initialize smart playlists: %s\n", err.message);
-        }
-    }
-
-    public Gee.ArrayList<SmartPlaylist> load_smart_playlists() {
-        var rv = new Gee.ArrayList<SmartPlaylist>();
-        assert (database != null);
-
-        try {
-            string script = "SELECT * FROM `smart_playlists`";
-            Query query = new Query(database, script);
-
-            for (var results = query.execute(); !results.finished; results.next() ) {
-                SmartPlaylist p = new SmartPlaylist (libraries_manager.local_library);
-
-                p.name = results.fetch_string(0);
-                p.conditional = (SmartPlaylist.ConditionalType)results.fetch_int(1);
-                p.add_queries (queries_from_string(results.fetch_string (2)));
-                p.limit = ( results.fetch_string(3) == "1") ? true : false;
-                p.limit_amount = results.fetch_int(4);
-
-                rv.add(p);
-            }
-        }
-        catch (SQLHeavy.Error err) {
-            warning ("Could not load smart playlists from db: %s\n", err.message);
-        }
-
-        return rv;
-    }
-
-    public void save_smart_playlists(Gee.Collection<SmartPlaylist> smarts) {
-        assert (database != null);
-        try {
-            database.execute("DELETE FROM `smart_playlists`");
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare ("INSERT INTO `smart_playlists` (`name`, `and_or`, `queries`, `limit`, `limit_amount`) VALUES (:name, :and_or, :queries, :limit, :limit_amount);");
-
-            foreach(SmartPlaylist s in smarts) {
-                query.set_string(":name", s.name);
-                query.set_int(":and_or", (int)s.conditional);
-                query.set_string(":queries", queries_to_string (s.get_queries ()));
-                query.set_int(":limit", ( s.limit ) ? 1 : 0);
-                query.set_int(":limit_amount", s.limit_amount);
-
-                query.execute();
-            }
-
-            transaction.commit();
-        } catch (SQLHeavy.Error err) {
-            warning ("Could not save smart playlists: %s \n", err.message);
-        }
-    }
-
-    public void save_smart_playlist (SmartPlaylist p, string? old_name = null) {
-        assert (database != null);
-        if (old_name == null) {
-            remove_smart_playlist (p);
-        } else {
-            var sp = new SmartPlaylist (libraries_manager.local_library);
-            sp.name = old_name;
-            remove_smart_playlist (sp);
-        }
-
-        try {
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare("""INSERT INTO `smart_playlists` (`name`, `and_or`, `queries`, `limit`, `limit_amount`) VALUES (:name, :and_or, :queries, :limit, :limit_amount);""");
-
-            query.set_string(":name", p.name);
-            query.set_int(":and_or", (int)p.conditional);
-            query.set_string(":queries", queries_to_string (p.get_queries ()));
-            query.set_int(":limit", ( p.limit ) ? 1 : 0);
-            query.set_int(":limit_amount", p.limit_amount);
-
-            query.execute();
-            transaction.commit();
-        } catch(SQLHeavy.Error err) {
-            warning ("Could not update smart playlist: %s \n", err.message);
-        }
-    }
-
-    public void remove_smart_playlist (SmartPlaylist p) {
-        assert (database != null);
-        try {
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare("""DELETE FROM `smart_playlists` WHERE name=:name""");
-
-            query.set_string(":name", p.name);
-            query.execute();
-
-            transaction.commit();
-        } catch (SQLHeavy.Error err) {
-            warning ("Could not remove smart playlist from db: %s\n", err.message);
-        }
-    }
-
-    public Gee.Collection<DevicePreferences> load_devices() {
-        assert (database != null);
-        var rv = new Gee.ArrayList<DevicePreferences>();
-
-        try {
-            string script = """SELECT rowid,* FROM `devices`""";
-            Query query = new Query(database, script);
-
-            for (var results = query.execute(); !results.finished; results.next() ) {
-                DevicePreferences dp = new DevicePreferences(results.fetch_string(1));
-
-                dp.sync_when_mounted = (results.fetch_int(2) == 1);
-                dp.sync_music = (results.fetch_int(3) == 1);
-                dp.sync_podcasts = (results.fetch_int(4) == 1);
-                dp.sync_audiobooks = (results.fetch_int(5) == 1);
-                dp.sync_all_music = (results.fetch_int(6) == 1);
-                dp.sync_all_podcasts = (results.fetch_int(7) == 1);
-                dp.sync_all_audiobooks = (results.fetch_int(8) == 1);
-                if (results.fetch_string(9) != null) {
-                    dp.music_playlist = libraries_manager.local_library.playlist_from_name (results.fetch_string(9));
-                    if (dp.music_playlist == null)
-                        dp.music_playlist = libraries_manager.local_library.smart_playlist_from_name (results.fetch_string(9));
-                }
-                if (results.fetch_string(10) != null) {
-                    dp.podcast_playlist = libraries_manager.local_library.playlist_from_name (results.fetch_string(10));
-                    if (dp.podcast_playlist == null)
-                        dp.podcast_playlist = libraries_manager.local_library.smart_playlist_from_name (results.fetch_string(10));
-                }
-                if (results.fetch_string(11) != null) {
-                    dp.audiobook_playlist = libraries_manager.local_library.playlist_from_name (results.fetch_string(11));
-                    if (dp.audiobook_playlist == null)
-                        dp.audiobook_playlist = libraries_manager.local_library.smart_playlist_from_name (results.fetch_string(11));
-                }
-                dp.last_sync_time = results.fetch_int(12);
-
-                rv.add (dp);
-            }
-        } catch (SQLHeavy.Error err) {
-            warning ("Could not load devices from db: %s\n", err.message);
-        }
-
-        return rv;
-    }
-
-    public void save_devices(Gee.Collection<DevicePreferences> devices) {
-        assert (database != null);
-        try {
-            database.execute("DELETE FROM `devices`");
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare("""INSERT INTO `devices` (`unique_id`, `sync_when_mounted`, `sync_music`,
-            `sync_podcasts`, `sync_audiobooks`, `sync_all_music`, `sync_all_podcasts`, `sync_all_audiobooks`, `music_playlist`,
-            `podcast_playlist`, `audiobook_playlist`, `last_sync_time`) VALUES (:unique_id, :sync_when_mounted, :sync_music, :sync_podcasts, :sync_audiobooks,
-            :sync_all_music, :sync_all_podcasts, :sync_all_audiobooks, :music_playlist, :podcast_playlist, :audiobook_playlist, :last_sync_time);""");
-
-            foreach(DevicePreferences dp in devices) {
-                query.set_string(":unique_id", dp.id);
-                query.set_int(":sync_when_mounted", dp.sync_when_mounted ? 1 : 0);
-
-                query.set_int(":sync_music", dp.sync_music ? 1 : 0);
-                query.set_int(":sync_podcasts", dp.sync_podcasts ? 1 : 0);
-                query.set_int(":sync_audiobooks", dp.sync_audiobooks ? 1 : 0);
-
-                query.set_int(":sync_all_music", dp.sync_all_music ? 1 : 0);
-                query.set_int(":sync_all_podcasts", dp.sync_all_podcasts ? 1 : 0);
-                query.set_int(":sync_all_audiobooks", dp.sync_all_audiobooks ? 1 : 0);
-                
-                string music_playlist = "";
-                string podcast_playlist = "";
-                string audiobook_playlist = "";
-                
-                if (dp.music_playlist != null)
-                    music_playlist = dp.music_playlist.name;
-                if (dp.podcast_playlist != null)
-                    podcast_playlist = dp.podcast_playlist.name;
-                if (dp.audiobook_playlist != null)
-                    audiobook_playlist = dp.audiobook_playlist.name;
-
-                query.set_string(":music_playlist", music_playlist);
-                query.set_string(":podcast_playlist", podcast_playlist);
-                query.set_string(":audiobook_playlist", audiobook_playlist);
-                query.set_int(":last_sync_time", dp.last_sync_time);
-
-                query.execute();
-            }
-
-            transaction.commit();
-        } catch (SQLHeavy.Error err) {
-            warning ("Could not save devices: %s\n", err.message);
-        }
-    }
-
-    public void save_device (DevicePreferences dp) {
-        assert (database != null);
-        try {
-            remove_device (dp);
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare("""INSERT INTO `devices` (`unique_id`, `sync_when_mounted`, `sync_music`,
-            `sync_podcasts`, `sync_audiobooks`, `sync_all_music`, `sync_all_podcasts`, `sync_all_audiobooks`, `music_playlist`,
-            `podcast_playlist`, `audiobook_playlist`, `last_sync_time`) VALUES (:unique_id, :sync_when_mounted, :sync_music, :sync_podcasts, :sync_audiobooks,
-            :sync_all_music, :sync_all_podcasts, :sync_all_audiobooks, :music_playlist, :podcast_playlist, :audiobook_playlist, :last_sync_time);""");
-
-            query.set_string(":unique_id", dp.id);
-            query.set_int(":sync_when_mounted", dp.sync_when_mounted ? 1 : 0);
-
-            query.set_int(":sync_music", dp.sync_music ? 1 : 0);
-            query.set_int(":sync_podcasts", dp.sync_podcasts ? 1 : 0);
-            query.set_int(":sync_audiobooks", dp.sync_audiobooks ? 1 : 0);
-
-            query.set_int(":sync_all_music", dp.sync_all_music ? 1 : 0);
-            query.set_int(":sync_all_podcasts", dp.sync_all_podcasts ? 1 : 0);
-            query.set_int(":sync_all_audiobooks", dp.sync_all_audiobooks ? 1 : 0);
-                
-            string music_playlist = "";
-            string podcast_playlist = "";
-            string audiobook_playlist = "";
-            
-            if (dp.music_playlist != null)
-                music_playlist = dp.music_playlist.name;
-            if (dp.podcast_playlist != null)
-                podcast_playlist = dp.podcast_playlist.name;
-            if (dp.audiobook_playlist != null)
-                audiobook_playlist = dp.audiobook_playlist.name;
-
-            query.set_string(":music_playlist", music_playlist);
-            query.set_string(":podcast_playlist", podcast_playlist);
-            query.set_string(":audiobook_playlist", audiobook_playlist);
-            query.set_int(":last_sync_time", dp.last_sync_time);
-
-            query.execute();
-
-            transaction.commit();
-        }
-        catch(SQLHeavy.Error err) {
-            warning ("Could not save device: %s\n", err.message);
-        }
-    }
-
-    public void remove_device (DevicePreferences device) {
-        assert (database != null);
-        try {
-            transaction = database.begin_transaction();
-            Query query = transaction.prepare("""DELETE FROM `devices` WHERE unique_id=:unique_id""");
-
-            query.set_string(":unique_id", device.id);
-            query.execute();
-
-            transaction.commit();
-        }
-        catch (SQLHeavy.Error err) {
-            warning ("Could not remove smart playlist from db: %s\n", err.message);
-        }
-    }
-}

=== removed file 'src/DataBase/DataBaseUpdater.vala'
--- src/DataBase/DataBaseUpdater.vala	2015-02-26 16:44:26 +0000
+++ src/DataBase/DataBaseUpdater.vala	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/*-
- * Copyright (c) 2012 Noise Developers (http://launchpad.net/noise)
- *
- * This software is licensed under the GNU General Public License
- * (version 2 or later). See the COPYING file in this distribution.
- *
- * The Noise authors hereby grant permission for non-GPL compatible
- * GStreamer plugins to be used and distributed together with GStreamer
- * and Noise. This permission is above and beyond the permissions granted
- * by the GPL license by which Noise is covered. If you modify this code
- * you may extend this exception to your version of the code, but you are not
- * obligated to do so. If you do not wish to do so, delete this exception
- * statement from your version.
- *
- * Authored by: Scott Ringwelski <[e-mail]>,
- *              Victor Eduardo <[e-mail]>
- */
-
-public class Noise.DataBaseUpdater : Object {
-
-    private Gee.LinkedList<Object> to_remove;
-
-    public DataBaseUpdater () {
-
-        to_remove = new Gee.LinkedList<Object> ();
-
-        // Save on a regular basis and before exit
-        var app = (Noise.App) GLib.Application.get_default ();
-        app.shutdown.connect_after (() => on_close_ui_save ());
-        app.shutdown.connect_after (update_db_sync);
-    }
-
-    public async void removeItem (Object item) {
-        if (!to_remove.contains (item))
-            to_remove.offer (item);
-
-        update_db_sync ();
-    }
-
-    private void update_db_sync () {
-        var dbm = DataBaseManager.get_default ();
-        for (Object? next = to_remove.poll (); next != null; next = to_remove.poll ()) {
-            if (next is Gee.Collection) {
-                dbm.remove_media (next as Gee.Collection<Media>);
-            } else if (next is StaticPlaylist) {
-                dbm.remove_playlist (next as StaticPlaylist);
-                dbm.remove_columns_state (next as StaticPlaylist, null);
-            } else if (next is SmartPlaylist) {
-                dbm.remove_smart_playlist (next as SmartPlaylist);
-                dbm.remove_columns_state (null, next as SmartPlaylist);
-            } else
-                assert_not_reached ();
-        }
-    }
-
-    private bool on_close_ui_save () {
-        var playlists_and_queue = new Gee.TreeSet<StaticPlaylist> ();
-        playlists_and_queue.add_all (libraries_manager.local_library.get_playlists ());
-
-        playlists_and_queue.add (((LocalLibrary)libraries_manager.local_library).p_music);
-
-        debug ("-- Saving columns state preferences DB.");
-
-        var dbm = DataBaseManager.get_default ();
-        dbm.save_playlist (((LocalLibrary)libraries_manager.local_library).p_music);
-        dbm.save_columns_state (playlists_and_queue, libraries_manager.local_library.get_smart_playlists ());
-
-        debug ("-- Finished columns state preferences DB.");
-
-        return true;
-    }
-    // If the name of the playlist changed, it provides the old name to remove it from database
-    public void save_device (DevicePreferences device) {
-        DataBaseManager.get_default ().save_device (device);
-    }
-    
-    // If the name of the playlist changed, it provides the old name to remove it from database
-    public void save_playlist (StaticPlaylist p, string? old_name = null) {
-        DataBaseManager.get_default ().save_playlist (p, old_name);
-    }
-    
-    // If the name of the playlist changed, it provides the old name to remove it from database
-    public void save_smart_playlist (SmartPlaylist p, string? old_name = null) {
-        DataBaseManager.get_default ().save_smart_playlist (p, old_name);
-    }
-}

=== modified file 'src/Dialogs/FileNotFoundDialog.vala'
--- src/Dialogs/FileNotFoundDialog.vala	2015-06-12 13:43:45 +0000
+++ src/Dialogs/FileNotFoundDialog.vala	2015-08-27 10:21:27 +0000
@@ -118,7 +118,7 @@
 
     void locate_media_clicked () {
         Media m = media_list.get (0);
-        int media_id = m.rowid;
+        int64 media_id = m.rowid;
 
         string file = "";
         var file_chooser = new Gtk.FileChooserDialog (_("Choose Music Folder"), this,

=== modified file 'src/Dialogs/MediaEditor.vala'
--- src/Dialogs/MediaEditor.vala	2015-06-12 13:43:45 +0000
+++ src/Dialogs/MediaEditor.vala	2015-08-27 10:21:27 +0000
@@ -38,8 +38,8 @@
 public class Noise.MediaEditor : Gtk.Dialog {
     LyricFetcher lf;
     
-    Gee.LinkedList<int> _allMedias = new Gee.LinkedList<int> ();
-    Gee.LinkedList<int> _medias = new Gee.LinkedList<int> ();
+    Gee.LinkedList<int64?> _allMedias = new Gee.LinkedList<int64?> ();
+    Gee.LinkedList<int64?> _medias = new Gee.LinkedList<int64?> ();
     
     //for padding around notebook mostly
     Gtk.Stack stack;
@@ -53,9 +53,9 @@
     private Gtk.Label lyricsInfobarLabel;
     private Library library;
     
-    public signal void medias_saved (Gee.Collection<int> medias);
+    public signal void medias_saved (Gee.Collection<int64?> medias);
     
-    public MediaEditor (Gee.Collection<int> allMedias, Gee.Collection<int> medias, Library library) {
+    public MediaEditor (Gee.Collection<int64?> allMedias, Gee.Collection<int64?> medias, Library library) {
         this.library = library;
         this.window_position = Gtk.WindowPosition.CENTER;
         this.type_hint = Gdk.WindowTypeHint.DIALOG;
@@ -64,16 +64,16 @@
         this.destroy_with_parent = true;
         this.resizable = false;
         this.deletable = false;
-        
+
         this.set_size_request (520, -1);
 
         lf = new LyricFetcher();
-        
+
         _allMedias.add_all (allMedias);
         _medias.add_all (medias);
-        
+
         stack = new Gtk.Stack ();
-        
+
         var stack_switcher = new Gtk.StackSwitcher ();
         stack_switcher.set_stack (stack);
         stack_switcher.halign = Gtk.Align.CENTER;
@@ -104,8 +104,9 @@
         buttons.set_child_secondary (arrows, true);
 
         var main_grid = new Gtk.Grid ();
-        main_grid.attach (stack, 0, 0, 1, 1);
-        main_grid.attach (buttons, 0, 1, 1, 1);
+        main_grid.attach (stack_switcher, 0, 0, 1, 1);
+        main_grid.attach (stack, 0, 1, 1, 1);
+        main_grid.attach (buttons, 0, 2, 1, 1);
 
         var content = get_content_area () as Gtk.Container;
         content.margin_left = content.margin_right = 12;
@@ -133,7 +134,7 @@
         Media sum = library.media_from_id(_medias.get(0)).copy();
         
         /** find what these media have what common, and keep those values **/
-        foreach(int i in _medias) {
+        foreach (int64 i in _medias) {
             Media s = library.media_from_id(i);
             
             if(s.track != sum.track)
@@ -294,13 +295,12 @@
         });
     }
 
-    
     public void previousClicked() {
         save_medias();
         
         // now fetch the next media on current_view
-        int i = 0; // will hold next media to edit
-        int indexOfCurrentFirst = _allMedias.index_of(_medias.get(0));
+        int64 i = 0; // will hold next media to edit
+        int indexOfCurrentFirst = _allMedias.index_of(_medias.first ());
         
         if(indexOfCurrentFirst == 0)
             i = _allMedias.get(_allMedias.size - 1);
@@ -308,7 +308,7 @@
             i = _allMedias.get(indexOfCurrentFirst - 1);
         
         // now fetch the previous media on current_view
-        var newMedias = new Gee.LinkedList<int>();
+        var newMedias = new Gee.LinkedList<int64?> ();
         newMedias.add(i);
         
         change_media(newMedias);
@@ -318,21 +318,21 @@
         save_medias();
         
         // now fetch the next media on current_view
-        int i = 0; // will hold next media to edit
+        int64 i = 0; // will hold next media to edit
         int indexOfCurrentLast = _allMedias.index_of(_medias.get(_medias.size - 1));
         
         if(indexOfCurrentLast == _allMedias.size - 1)
-            i = _allMedias.get(0);
+            i = _allMedias.first ();
         else
             i = _allMedias.get(indexOfCurrentLast + 1);
         
-        var newMedias = new Gee.LinkedList<int>();
+        var newMedias = new Gee.LinkedList<int64?>();
         newMedias.add(i);
         
         change_media(newMedias);
     }
     
-    public void change_media(Gee.LinkedList<int> newMedias) {
+    public void change_media(Gee.LinkedList<int64?> newMedias) {
         _medias = newMedias;
         
         Media sum = library.media_from_id(newMedias.get(0));
@@ -376,8 +376,8 @@
     }
     
     public void save_medias() {
-        foreach(int i in _medias) {
-            Media s = library.media_from_id(i);
+        foreach (int64 i in _medias) {
+            Media s = library.media_from_id (i);
             
             if(fields.get("Title").checked())
                 s.title = fields.get("Title").get_value();

=== modified file 'src/Dialogs/SmartPlaylistEditor.vala'
--- src/Dialogs/SmartPlaylistEditor.vala	2015-06-12 13:43:45 +0000
+++ src/Dialogs/SmartPlaylistEditor.vala	2015-08-27 10:21:27 +0000
@@ -208,9 +208,10 @@
 
     public virtual void save_click () {
         sp.clear_queries ();
-        var queries = new Gee.LinkedList<SmartQuery> ();
+        var queries = new Gee.TreeSet<SmartQuery> ();
         foreach (SmartPlaylistEditorQuery speq in queries_list) {
-            queries.add (speq.get_query ());
+            var query = speq.get_query ();
+            queries.add (query);
         }
 
         sp.add_queries (queries);
@@ -265,7 +266,6 @@
         field_combobox.append_text (_("Comment"));
         field_combobox.append_text (_("Composer"));
         field_combobox.append_text (_("Date Added"));
-        field_combobox.append_text (_("Date Released"));
         field_combobox.append_text (_("Genre"));
         field_combobox.append_text (_("Grouping"));
         field_combobox.append_text (_("Last Played"));
@@ -281,11 +281,11 @@
         comparator_combobox.set_active ((int)q.comparator);
 
         if (needs_value (q.field)) {
-            value_entry.text = q.value;
+            value_entry.text = q.value.get_string ();
         } else if (q.field == SmartQuery.FieldType.RATING) {
-            _valueRating.rating = int.parse (q.value);
+            _valueRating.rating = q.value.get_int ();
         } else {
-            _valueNumerical.set_value (int.parse (q.value));
+            _valueNumerical.set_value (q.value.get_int ());
         }
 
         _units = new Gtk.Label ("");
@@ -308,16 +308,23 @@
     }
 
     public SmartQuery get_query () {
-        SmartQuery rv = new SmartQuery ();
+        var rv = new SmartQuery ();
 
         rv.field = (SmartQuery.FieldType)field_combobox.get_active ();
         rv.comparator = comparators.get (comparator_combobox.get_active ());
-        if (needs_value ((SmartQuery.FieldType)field_combobox.get_active ()))
-            rv.value = value_entry.text;
-        else if (field_combobox.get_active () == SmartQuery.FieldType.RATING)
-            rv.value = _valueRating.rating.to_string ();
-        else
-            rv.value = _valueNumerical.value.to_string ();
+        if (needs_value ((SmartQuery.FieldType)field_combobox.get_active ())) {
+            var value = Value (typeof (string));
+            value.set_string (value_entry.text);
+            rv.value = value;
+        } else if (field_combobox.get_active () == SmartQuery.FieldType.RATING) {
+            var value = Value (typeof (int));
+            value.set_int (_valueRating.rating);
+            rv.value = value;
+        } else {
+            var value = Value (typeof (int));
+            value.set_int ((int)_valueNumerical.value);
+            rv.value = value;
+        }
 
         return rv;
     }
@@ -437,7 +444,6 @@
     }
 
     public bool is_date (SmartQuery.FieldType compared) {
-        return (compared == SmartQuery.FieldType.LAST_PLAYED || compared == SmartQuery.FieldType.DATE_ADDED
-                || compared == SmartQuery.FieldType.DATE_RELEASED);
+        return (compared == SmartQuery.FieldType.LAST_PLAYED || compared == SmartQuery.FieldType.DATE_ADDED);
     }
 }

=== modified file 'src/FileOperator.vala'
--- src/FileOperator.vala	2015-05-24 21:46:00 +0000
+++ src/FileOperator.vala	2015-08-27 10:21:27 +0000
@@ -309,7 +309,7 @@
             App.main_window.show_notification (_("Import Complete"), _("%s has imported your library.").printf (((Noise.App) GLib.Application.get_default ()).get_name ()));
 
         if (import_type == ImportType.PLAYLIST) {
-            var to_add = new Gee.LinkedList<int> ();
+            var to_add = new Gee.LinkedList<int64?> ();
             foreach (var s in all_new_imports)
                 to_add.add (s.rowid);
             new_playlist.add_medias (to_add);

=== modified file 'src/LibraryWindow.vala'
--- src/LibraryWindow.vala	2015-06-12 16:10:33 +0000
+++ src/LibraryWindow.vala	2015-08-27 10:21:27 +0000
@@ -78,7 +78,6 @@
     private Gee.HashMap<unowned Playlist, int> match_playlists;
     private Gee.HashMap<string, int> match_devices;
     private Gee.HashMap<unowned Playlist, SourceListEntry> match_playlist_entry;
-    private Gee.HashMap<Playlist, TreeViewSetup> match_tvs;
 
     public LibraryWindow () {
         headerbar = new Gtk.HeaderBar ();
@@ -124,8 +123,10 @@
         match_playlists = new Gee.HashMap<unowned Playlist, int> ();
         match_devices = new Gee.HashMap<string, int> ();
         match_playlist_entry = new Gee.HashMap<unowned Playlist, SourceListEntry> ();
-        match_tvs = new Gee.HashMap<Playlist, TreeViewSetup> ();
 
+        libraries_manager.add_headless_playlist.connect ((playlist) => {
+            add_playlist (playlist);
+        });
 
         // init some booleans
         if (this.library_manager.get_medias ().size > 0) {
@@ -340,7 +341,7 @@
 
     public void connect_to_sourcelist_signals () {
         
-        source_list_view.selection_changed.connect ( (page_number) => {
+        source_list_view.selection_changed.connect ((page_number) => {
             view_container.set_current_view_from_index (page_number);
         });
         
@@ -348,7 +349,7 @@
             search_field_has_focus = false;
         });
         
-        source_list_view.item_action_activated.connect ( (page_number) => {
+        source_list_view.item_action_activated.connect ((page_number) => {
             var view = view_container.get_view (page_number);
             if (view is DeviceView) {
                 ((DeviceView)view).d.eject();
@@ -356,7 +357,7 @@
         });
         source_list_view.edited.connect (playlist_name_edited);
 
-        source_list_view.playlist_rename_clicked.connect ( (page_number) => {
+        source_list_view.playlist_rename_clicked.connect ((page_number) => {
             var view = view_container.get_view (page_number);
             if (view is PlaylistViewWrapper) {
                 search_field_has_focus = false;
@@ -364,26 +365,29 @@
             }
         });
         
-        source_list_view.playlist_edit_clicked.connect ( (page_number) => {
+        source_list_view.playlist_edit_clicked.connect ((page_number) => {
             var view = view_container.get_view (page_number);
             if (view is PlaylistViewWrapper) {
-                show_smart_playlist_dialog(library_manager.smart_playlist_from_id(((PlaylistViewWrapper)view).playlist_id));
+                var p = ((PlaylistViewWrapper)view).playlist;
+                if (p is SmartPlaylist) {
+                    show_smart_playlist_dialog ((SmartPlaylist) p);
+                }
             }
         });
         
-        source_list_view.playlist_remove_clicked.connect ( (page_number) => {
+        source_list_view.playlist_remove_clicked.connect ((page_number) => {
             var view = view_container.get_view (page_number);
             if (view is PlaylistViewWrapper) {
                 var playlistview = (PlaylistViewWrapper)view;
                 if (playlistview.hint == ViewWrapper.Hint.PLAYLIST) {
-                    ((ViewWrapper)view).library.remove_playlist(playlistview.playlist_id);
+                    playlistview.library.remove_playlist (playlistview.playlist.rowid);
                 } else if (playlistview.hint == ViewWrapper.Hint.SMART_PLAYLIST) {
-                    ((ViewWrapper)view).library.remove_smart_playlist(playlistview.playlist_id);
+                    playlistview.library.remove_smart_playlist (playlistview.playlist.rowid);
                 }
             }
         });
         
-        source_list_view.device_import_clicked.connect ( (page_number) => {
+        source_list_view.device_import_clicked.connect ((page_number) => {
             foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) {
                 if(page_number == match_devices.get (device.get_unique_identifier())) {
                     libraries_manager.transfer_to_local_library (device.get_library().get_medias ());
@@ -392,7 +396,7 @@
             }
         });
         
-        source_list_view.device_new_playlist_clicked.connect ( (page_number) => {
+        source_list_view.device_new_playlist_clicked.connect ((page_number) => {
             foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) {
                 if(page_number == match_devices.get (device.get_unique_identifier())) {
                     create_new_playlist (device.get_library());
@@ -401,7 +405,7 @@
             }
         });
         
-        source_list_view.device_sync_clicked.connect ( (page_number) => {
+        source_list_view.device_sync_clicked.connect ((page_number) => {
             foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) {
                 if(page_number == match_devices.get (device.get_unique_identifier())) {
                     device.synchronize ();
@@ -410,7 +414,7 @@
             }
         });
         
-        source_list_view.device_eject_clicked.connect ( (page_number) => {
+        source_list_view.device_eject_clicked.connect ((page_number) => {
             foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) {
                 if(page_number == match_devices.get (device.get_unique_identifier())) {
                     device.eject();
@@ -419,25 +423,25 @@
             }
         });
         
-        source_list_view.playlist_remove_clicked.connect ( (page_number) => {
+        source_list_view.playlist_remove_clicked.connect ((page_number) => {
             var view = view_container.get_view (page_number);
             if (view is PlaylistViewWrapper) {
                 var playlistview = (PlaylistViewWrapper)view;
                 if (playlistview.hint == ViewWrapper.Hint.PLAYLIST) {
-                    ((ViewWrapper)view).library.remove_playlist(playlistview.playlist_id);
+                    playlistview.library.remove_playlist (playlistview.playlist.rowid);
                 } else if (playlistview.hint == ViewWrapper.Hint.SMART_PLAYLIST) {
-                    ((ViewWrapper)view).library.remove_smart_playlist(playlistview.playlist_id);
+                    playlistview.library.remove_smart_playlist (playlistview.playlist.rowid);
                 }
             }
         });
         
-        source_list_view.playlist_save_clicked.connect ( (page_number) => {
+        source_list_view.playlist_save_clicked.connect ((page_number) => {
             var view = view_container.get_view (page_number);
             if (view is PlaylistViewWrapper) {
                 var playlistview = (PlaylistViewWrapper)view;
                 if (playlistview.hint != ViewWrapper.Hint.READ_ONLY_PLAYLIST)
                     return;
-                var playlist = library_manager.playlist_from_id (playlistview.playlist_id);
+                var playlist = playlistview.playlist;
                 if (playlist != null) {
                     var new_playlist = new StaticPlaylist ();
                     new_playlist.name = PlaylistsUtils.get_new_playlist_name (library_manager.get_playlists (), playlist.name);
@@ -447,29 +451,29 @@
             }
         });
         
-        source_list_view.playlist_export_clicked.connect ( (page_number) => {
+        source_list_view.playlist_export_clicked.connect ((page_number) => {
             var view = view_container.get_view (page_number);
             if (view is PlaylistViewWrapper) {
                 var playlistview = (PlaylistViewWrapper)view;
                 switch (playlistview.hint) {
                     case ViewWrapper.Hint.PLAYLIST:
                     case ViewWrapper.Hint.READ_ONLY_PLAYLIST:
-                        PlaylistsUtils.export_playlist (((ViewWrapper)view).library.playlist_from_id (playlistview.playlist_id));
+                        PlaylistsUtils.export_playlist (playlistview.playlist);
                         break;
                     case ViewWrapper.Hint.SMART_PLAYLIST:
-                        PlaylistsUtils.export_playlist (((ViewWrapper)view).library.smart_playlist_from_id (playlistview.playlist_id));
+                        PlaylistsUtils.export_playlist (playlistview.playlist);
                         break;
                 }
             }
         });
 
-        source_list_view.playlist_media_added.connect ( (page_number, uris) => {
+        source_list_view.playlist_media_added.connect ((page_number, uris) => {
             var view = view_container.get_view (page_number);
             if (view is PlaylistViewWrapper) {
                 var playlistview = (PlaylistViewWrapper) view;
                 if (playlistview.hint == ViewWrapper.Hint.PLAYLIST) {
                     var library = playlistview.library;
-                    var playlist = library.playlist_from_id (playlistview.playlist_id);
+                    var playlist = playlistview.playlist;
                     if (playlist == null)
                         return;
 
@@ -508,18 +512,21 @@
         viewSelector.selected = (Widgets.ViewSelector.Mode) Settings.SavedState.get_default ().view_mode;
 
         initialization_finished = true;
-        
+
         // Set the focus on the current view
-        if (main_settings.last_playlist_playing != -1) {
-            for (int i =0; i< view_container.get_n_pages (); i++) {
-                var parent = view_container.get_nth_page (i) as ViewWrapper;
-                if (parent.relative_id == main_settings.last_playlist_playing) {
-                    if (parent.hint == Noise.ViewWrapper.Hint.PLAYLIST || parent.hint == Noise.ViewWrapper.Hint.READ_ONLY_PLAYLIST)
-                        show_playlist_view (libraries_manager.local_library.playlist_from_id (parent.relative_id));
-                    else if (parent.hint == Noise.ViewWrapper.Hint.SMART_PLAYLIST)
-                        show_playlist_view (libraries_manager.local_library.smart_playlist_from_id (parent.relative_id));
-                    break;
-                }
+        if (main_settings.last_playlist_playing != "") {
+            Playlist? p = null;
+            if (main_settings.last_playlist_playing.contains ("s")) {
+                int64 rowid = int64.parse (main_settings.last_playlist_playing.replace ("s", ""));
+                p = library_manager.smart_playlist_from_id (rowid);
+            } else {
+                int64 rowid = int64.parse (main_settings.last_playlist_playing.replace ("p", ""));
+                p = library_manager.playlist_from_id (rowid);
+            }
+
+            if (p != null) {
+                show_playlist_view (p);
+            } else {
                 show_playlist_view (library_manager.p_music);
             }
         } else {
@@ -534,17 +541,17 @@
         searchField.activate.connect (searchFieldActivate);
         searchField.search_changed.connect (() => {if (searchField.text_length != 1) libraries_manager.search_for_string (searchField.get_text ());});
         searchField.text = main_settings.search_string;
-        libraries_manager.search_for_string (main_settings.search_string);
 
         debug ("DONE WITH USER INTERFACE");
 
-        int last_playing_id = main_settings.last_media_playing;
-
-        if (last_playing_id > 0) {
+        int64 last_playing_id = main_settings.last_media_playing;
+        if (last_playing_id >= 0) {
             var last_playing_media = library_manager.media_from_id (last_playing_id);
-            if (last_playing_media != null && last_playing_media.file.query_exists ())
+            if (last_playing_media != null && last_playing_media.file.query_exists ()) {
                 App.player.playMedia (last_playing_media, true);
+            }
         }
+        libraries_manager.search_for_string (Settings.Main.get_default ().search_string);
     }
 
     /**
@@ -655,36 +662,20 @@
 
     private void load_playlists () {
         debug ("Loading playlists");
-        
-        library_manager.add_playlist (App.player.queue_playlist);
-        library_manager.add_playlist (App.player.history_playlist);
-        
-        match_tvs.set_all (DataBaseManager.get_default ().load_columns_state ());
-        
+
         foreach (SmartPlaylist p in library_manager.get_smart_playlists()) {
             add_smartplaylist (p);
         }
 
         foreach (StaticPlaylist p in library_manager.get_playlists()) {
-            if (p.name != App.player.queue_playlist.name && p.name != App.player.history_playlist.name)
-                add_playlist (p);
-        }
-        
-        TreeViewSetup? music_tvs = null;
-        foreach (var entry in match_tvs.entries) {
-            if (entry.key.name == MUSIC_PLAYLIST) {
-                music_tvs = entry.value;
-                music_tvs.set_hint (ViewWrapper.Hint.MUSIC);
-                break;
-            }
-        }
-        if (music_tvs == null) {
-            music_tvs = new TreeViewSetup (ListColumn.ARTIST,
-                                             Gtk.SortType.ASCENDING,
-                                             ViewWrapper.Hint.MUSIC);
-            match_tvs.set (library_manager.p_music, music_tvs);
-        }
+            add_playlist (p);
+        }
+
+        libraries_manager.add_headless_playlist (App.player.queue_playlist);
+        libraries_manager.add_headless_playlist (App.player.history_playlist);
+
         // Add Music Library View
+        var music_tvs = new TreeViewSetup (ViewWrapper.Hint.MUSIC, "library:main", library_manager.connection);
         var music_view_wrapper = new MusicViewWrapper (music_tvs, library_manager, topDisplay);
         int view_number = view_container.add_view (music_view_wrapper);
         var entry = source_list_view.add_item (view_number, _("Music"), ViewWrapper.Hint.MUSIC, new ThemedIcon ("library-music"));
@@ -772,20 +763,22 @@
         match_devices.unset (device.get_unique_identifier());
         remove_view_and_update (page_number);
     }
-    
+
     private void create_device_source_list (Device d) {
         lock (match_devices) {
             SourceListEntry? entry;
-            var dv = new DeviceView (d);
+            var pref = library_manager.get_preferences_for_device (d);
+            var dv = new DeviceView (d, pref);
             int view_number = view_container.add_view (dv);
-            match_devices.set (d.get_unique_identifier(), view_number);
-            if(d.only_use_custom_view()) {
+            match_devices.set (d.get_unique_identifier (), view_number);
+            if (d.only_use_custom_view ()) {
                 message("new custom device (probably a CD) added with %d songs.\n", d.get_library ().get_medias().size);
 
                 entry = source_list_view.add_item  (view_number, d.getDisplayName(), ViewWrapper.Hint.DEVICE, d.get_icon(), new ThemedIcon ("media-eject-symbolic"), null, d);
             } else {
                 debug ("adding device view with %d\n", d.get_library ().get_medias().size);
-                var music_view_wrapper = new DeviceViewWrapper(new TreeViewSetup(ListColumn.ARTIST, Gtk.SortType.ASCENDING, ViewWrapper.Hint.DEVICE_AUDIO), d, d.get_library ());
+                var tvs = new TreeViewSetup (ViewWrapper.Hint.DEVICE_AUDIO);
+                var music_view_wrapper = new DeviceViewWrapper(tvs, d, d.get_library ());
                 
                 int subview_number = view_container.add_view (music_view_wrapper);
                 entry = source_list_view.add_item  (view_number, d.getDisplayName(), ViewWrapper.Hint.DEVICE, d.get_icon(), new ThemedIcon ("media-eject-symbolic"), null, d);
@@ -825,10 +818,6 @@
         library.add_playlist(playlist);
     }
 
-    public TreeViewSetup? get_treeviewsetup_from_playlist (Playlist p) {
-        return match_tvs.get (p);
-    }
-
     public void show_playlist_view (Playlist p) {
         if (match_playlists.has_key (p)) {
             source_list_view.selected = match_playlist_entry.get (p);
@@ -837,46 +826,40 @@
     }
 
     private void create_playlist_source_list (StaticPlaylist p, SourceListExpandableItem? into_expandable = null, Library? library = library_manager) {
-        SourceListEntry? entry;
-        int view_number;
-        if (p.read_only == false) {
-            var view = new PlaylistViewWrapper (p.rowid, ViewWrapper.Hint.PLAYLIST, null, library);
-            view_number = view_container.add_view (view);
-            entry = source_list_view.add_item  (view_number, p.name, ViewWrapper.Hint.PLAYLIST, p.icon, null, into_expandable);
+        ViewWrapper.Hint hint = ViewWrapper.Hint.PLAYLIST;
+        if (p.read_only == true) {
+            hint = ViewWrapper.Hint.READ_ONLY_PLAYLIST;
+        }
+
+        TreeViewSetup? tvs = null;
+        if (p is LocalStaticPlaylist) {
+            tvs = new TreeViewSetup (hint, "library:p%lld".printf (p.rowid), library_manager.connection);
+        } else if (p == App.player.queue_playlist) {
+            tvs = new TreeViewSetup (hint, "library:queue", library_manager.connection);
+        } else if (p == App.player.history_playlist) {
+            tvs = new TreeViewSetup (hint, "library:history", library_manager.connection);
         } else {
-            if (p.name == C_("Name of the playlist", "Queue")) {
-                var queue_view = new PlaylistViewWrapper (App.player.queue_playlist.rowid, ViewWrapper.Hint.READ_ONLY_PLAYLIST, 
-                                        match_tvs.get (App.player.queue_playlist), library);
-                queue_view.set_no_media_alert_message (_("No songs in Queue"), 
-                        _("To add songs to the queue, use the <b>secondary click</b> on an item and choose <b>Queue</b>. When a song finishes, the queued songs will be played first before the next song in the currently playing list."));
-                view_number = view_container.add_view (queue_view);
-                entry = source_list_view.add_item  (view_number, App.player.queue_playlist.name,
-                                                    ViewWrapper.Hint.READ_ONLY_PLAYLIST, new ThemedIcon ("playlist-queue"));
-                update_badge_on_playlist_update (p, entry);
-                App.player.queue_media (p.medias);
-            } else if (p.name == _("History")) {
-                var history_view = new PlaylistViewWrapper (App.player.history_playlist.rowid, ViewWrapper.Hint.READ_ONLY_PLAYLIST, 
-                                                match_tvs.get(App.player.history_playlist), library);
-                history_view.set_no_media_alert_message (_("No songs in History"), 
-                        _("After a part of a song has been played, it is added to the history list.\nYou can use this list to see all the songs you have played during the current session."));
-                view_number = view_container.add_view (history_view);
-                entry = source_list_view.add_item  (view_number, App.player.history_playlist.name,
-                                                    ViewWrapper.Hint.READ_ONLY_PLAYLIST, new ThemedIcon ("document-open-recent"));
-                App.player.history_playlist.add_medias (p.medias);
-            } else {
-                var view = new PlaylistViewWrapper (p.rowid, ViewWrapper.Hint.READ_ONLY_PLAYLIST, match_tvs.get(p), library);
-                view_number = view_container.add_view (view);
-                entry = source_list_view.add_item  (view_number, p.name, ViewWrapper.Hint.READ_ONLY_PLAYLIST, p.icon, null, into_expandable);
-                if (p.show_badge == true) {
-                    update_badge_on_playlist_update (p, entry);
-                }
-            }
-        }
-        lock (match_playlists) {
-            match_playlist_entry.set (p, entry);
-            match_playlists.set (p, view_number);
-        }
-        if (newly_created_playlist == true) {
+            tvs = new TreeViewSetup (hint);
+        }
+
+        var view = new PlaylistViewWrapper (p, hint, tvs, library);
+        var view_number = view_container.add_view (view);
+        var entry = source_list_view.add_item (view_number, p.name, hint, p.icon, null, into_expandable);
+        if (p.show_badge == true) {
+            update_badge_on_playlist_update (p, entry);
+        }
+
+        if (p == App.player.queue_playlist) {
+            view.set_no_media_alert_message (_("No songs in Queue"), _("To add songs to the queue, use the <b>secondary click</b> on an item and choose <b>Queue</b>. When a song finishes, the queued songs will be played first before the next song in the currently playing list."));
+            App.player.queue_media (p.medias);
+        } else if (p == App.player.history_playlist) {
+            view.set_no_media_alert_message (_("No songs in History"), _("After a part of a song has been played, it is added to the history list.\nYou can use this list to see all the songs you have played during the current session."));
+        }
+
+        match_playlist_entry.set (p, entry);
+        match_playlists.set (p, view_number);
+
+        if (newly_created_playlist == true && p.read_only == false) {
             newly_created_playlist = false;
             show_playlist_view (p);
 
@@ -925,24 +908,34 @@
             }
         }
     }
+
     private void create_smartplaylist_source_list (SmartPlaylist p, SourceListExpandableItem? into_expandable = null, Library? library = library_manager) {
-        SourceListEntry? entry;
-        int view_number;
-        
-        var view = new PlaylistViewWrapper (p.rowid, ViewWrapper.Hint.SMART_PLAYLIST, match_tvs.get(p), library_manager);
-        view.button_clicked.connect ((playlist_id) => {
-            show_smart_playlist_dialog(library_manager.smart_playlist_from_id(playlist_id));
+        TreeViewSetup? tvs = null;
+        if (p is LocalSmartPlaylist) {
+            tvs = new TreeViewSetup (ViewWrapper.Hint.SMART_PLAYLIST, "library:s%lld".printf (p.rowid), library_manager.connection);
+        } else {
+            tvs = new TreeViewSetup (ViewWrapper.Hint.SMART_PLAYLIST);
+        }
+
+        var view = new PlaylistViewWrapper (p, ViewWrapper.Hint.SMART_PLAYLIST, tvs, library_manager);
+        view.button_clicked.connect ((playlist) => {
+            if (playlist is SmartPlaylist) {
+                show_smart_playlist_dialog ((SmartPlaylist) playlist);
+            }
         });
-        view_number = view_container.add_view (view);
-        entry = source_list_view.add_item  (view_number, p.name, ViewWrapper.Hint.SMART_PLAYLIST, p.icon);
+
+        var view_number = view_container.add_view (view);
+        var entry = source_list_view.add_item  (view_number, p.name, ViewWrapper.Hint.SMART_PLAYLIST, p.icon);
         p.updated.connect ((old_name) => {
             if (old_name != null)
                 source_list_view.change_playlist_name (match_playlists.get(p), p.name);
         });
+
         lock (match_playlists) {
             match_playlist_entry.set (p, entry);
             match_playlists.set (p, view_number);
         }
+
         if (newly_created_playlist == true) {
             newly_created_playlist = false;
             show_playlist_view (p);
@@ -996,7 +989,7 @@
     }
 
 
-    public virtual void playback_stopped (int was_playing) {
+    public virtual void playback_stopped (int64 was_playing) {
         playButton.set_image (new Gtk.Image.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.LARGE_TOOLBAR));
         //reset some booleans
         tested_for_video = false;
@@ -1175,7 +1168,7 @@
         //at 30 seconds in, we consider the media as played
         if(sec > 30 && !media_considered_played) {
             media_considered_played = true;
-            App.player.current_media.last_played = (int)time_t();
+            App.player.current_media.last_played = (int)time_t ();
 
             library_manager.update_media (App.player.current_media, false, false);
 
@@ -1185,17 +1178,6 @@
                 temp_media.add (App.player.current_media);
                 App.player.history_playlist.add_medias (temp_media);
             }
-
-#if HAVE_ZEITGEIST
-            var event = new Zeitgeist.Event.full (Zeitgeist.ZG_ACCESS_EVENT,
-                                                   Zeitgeist.ZG_SCHEDULED_ACTIVITY, "app://%s".printf (App.instance.get_desktop_file_name ()),
-                                                   new Zeitgeist.Subject.full(App.player.current_media.uri,
-                                                                               Zeitgeist.NFO_AUDIO,
-                                                                               Zeitgeist.NFO_FILE_DATA_OBJECT,
-                                                                               "text/plain", "",
-                                                                               App.player.current_media.title, ""));
-            new Zeitgeist.Log ().insert_events_no_reply(event);
-#endif
         }
 
         if((sec/media_length > 0.50) && (media_half_played_sended == false)) {

=== renamed file 'core/Devices/DevicePreferences.vala' => 'src/LocalBackend/DevicePreferences.vala'
--- core/Devices/DevicePreferences.vala	2015-06-12 13:51:08 +0000
+++ src/LocalBackend/DevicePreferences.vala	2015-08-27 10:21:27 +0000
@@ -30,24 +30,165 @@
  */
 
 public class Noise.DevicePreferences : GLib.Object {
-	public string id { get; construct set; }
-	
-	public bool sync_when_mounted { get; set; }
-	public int last_sync_time { get; set; }
-	
-	public bool sync_music { get; set; default=true; }
-	public bool sync_podcasts { get; set; default=false; }
-	public bool sync_audiobooks { get; set; default=false; }
-	
-	public bool sync_all_music { get; set; default=true;}
-	public bool sync_all_podcasts { get; set; default=true; }
-	public bool sync_all_audiobooks { get; set; default=true; }
-	
-	public unowned Playlist music_playlist { get; set; }
-	public unowned Playlist podcast_playlist { get; set; } // must only contain podcasts. if not, will ignore others
-	public unowned Playlist audiobook_playlist { get; set; } // must only contain audiobooks. if not, will ignore others
-	
-	public DevicePreferences (string id) {
-		this.id = id;
-	}
+    private string id;
+
+    public bool? _sync_when_mounted = null;
+    public bool sync_when_mounted {
+        get {
+            common_bool_getter ("sync_when_mounted", ref _sync_when_mounted);
+            return _sync_when_mounted;
+        }
+        set {
+            common_bool_setter ("sync_when_mounted", value, ref _sync_when_mounted);
+        }
+    }
+
+    public uint? _last_sync_time = null;
+    public uint last_sync_time {
+        get {
+            common_uint_getter ("last_sync_time", ref _last_sync_time);
+            return _last_sync_time;
+        }
+        set {
+            common_uint_setter ("last_sync_time", value, ref _last_sync_time);
+        }
+    }
+
+    public bool? _sync_music = null;
+    public bool sync_music {
+        get {
+            common_bool_getter ("sync_music", ref _sync_music);
+            return _sync_music;
+        }
+        set {
+            common_bool_setter ("sync_music", value, ref _sync_music);
+        }
+    }
+
+    public bool? _sync_all_music = null;
+    public bool sync_all_music {
+        get {
+            common_bool_getter ("sync_all_music", ref _sync_all_music);
+            return _sync_all_music;
+        }
+        set {
+            common_bool_setter ("sync_all_music", value, ref _sync_all_music);
+        }
+    }
+
+    public Playlist? music_playlist {
+        owned get {
+            var result = query_field ("music_playlist");
+            if (result.type () == typeof (Gda.Null)) {
+                return null;
+            }
+
+            string playlist_string = result.get_string ();
+            if (playlist_string == "" || playlist_string == null)
+                return null;
+            if ("p" in playlist_string) {
+                playlist_string = playlist_string.replace ("p", "");
+                return Noise.libraries_manager.local_library.playlist_from_id (int64.parse (playlist_string));
+            } else {
+                playlist_string = playlist_string.replace ("s", "");
+                return Noise.libraries_manager.local_library.smart_playlist_from_id (int64.parse (playlist_string));
+            }
+        }
+        set {
+            string playlist_string = "";
+            if (value != null) {
+                if (value is StaticPlaylist) {
+                    playlist_string = "p%lld".printf (value.rowid);
+                } else {
+                    playlist_string = "s%lld".printf (value.rowid);
+                }
+            }
+
+            set_field ("music_playlist", Database.make_string_value (playlist_string));
+        }
+    }
+
+    private Gda.Connection connection;
+
+    public DevicePreferences (Noise.Device device, Gda.Connection connection) {
+        this.id = device.get_unique_identifier ();
+        this.connection = connection;
+        if (query_field ("sync_music") == null) {
+            try {
+                var builder = new Gda.SqlBuilder (Gda.SqlStatementType.INSERT);
+                builder.set_table (Database.Devices.TABLE_NAME);
+                builder.add_field_value_as_gvalue ("unique_id", Database.make_string_value (id));
+                connection.statement_execute_non_select (builder.get_statement (), null, null);
+            } catch (Error e) {
+                warning ("Could not save media: %s", e.message);
+            }
+        }
+    }
+
+    private uint common_uint_getter (string field, ref uint? temp) {
+        if (temp != null)
+            return temp;
+
+        var result = query_field (field);
+        if (result.type () == typeof (Gda.Null)) {
+            temp = 0;
+            return temp;
+        }
+
+        temp = (uint)result.get_int ();
+        return temp;
+    }
+
+    private void common_uint_setter (string field, uint value, ref uint? temp) {
+        temp = value;
+        set_field (field, Database.make_uint_value (value));
+    }
+
+    private bool common_bool_getter (string field, ref bool? temp) {
+        if (temp != null)
+            return temp;
+
+        var result = query_field (field);
+        if (result.type () == typeof (Gda.Null)) {
+            temp = false;
+            return temp;
+        }
+
+        temp = result.get_int () == 1;
+        return temp;
+    }
+
+    private void common_bool_setter (string field, bool value, ref bool? temp) {
+        temp = value;
+        set_field (field, Database.make_bool_value (value));
+    }
+
+    private GLib.Value? query_field (string field) {
+        try {
+            var sql = new Gda.SqlBuilder (Gda.SqlStatementType.SELECT);
+            sql.select_add_target (Database.Devices.TABLE_NAME, null);
+            sql.add_field_value_id (sql.add_id (field), 0);
+            var id_field = sql.add_id ("unique_id");
+            var id_param = sql.add_expr_value (null, Database.make_string_value (id));
+            var id_cond = sql.add_cond (Gda.SqlOperatorType.EQ, id_field, id_param, 0);
+            sql.set_where (id_cond);
+            var data_model = connection.statement_execute_select (sql.get_statement (), null);
+            return data_model.get_value_at (data_model.get_column_index (field), 0);
+        } catch (Error e) {
+            critical ("Could not query field %s: %s", field, e.message);
+            return null;
+        }
+    }
+
+    private void set_field (string field, GLib.Value value) {
+        try {
+            var col_names = new GLib.SList<string> ();
+            col_names.append (field);
+            var values = new GLib.SList<GLib.Value?> ();
+            values.append (value);
+            connection.update_row_in_table_v (Database.Devices.TABLE_NAME, "unique_id", Database.make_string_value (id), col_names, values);
+        } catch (Error e) {
+            critical ("Could not set field %s: %s", field, e.message);
+        }
+    }
 }

=== modified file 'src/LocalBackend/LocalLibrary.vala'
--- src/LocalBackend/LocalLibrary.vala	2015-06-12 13:31:55 +0000
+++ src/LocalBackend/LocalLibrary.vala	2015-08-27 10:21:27 +0000
@@ -36,16 +36,13 @@
  * the visual representation of this class
  */
 public class Noise.LocalLibrary : Library {
-    public DataBaseUpdater dbu;
-
     private FileOperator fo;
     private GStreamerTagger tagger;
 
     private Gee.TreeSet<StaticPlaylist> _playlists;
     private Gee.TreeSet<SmartPlaylist> _smart_playlists;
-    private Gee.TreeSet<Media> _medias;
+    private Gee.HashMap<int64?, Media> _medias;
     private Gee.TreeSet<Media> _searched_medias;
-    private int playlists_rowid = 0;
 
     public StaticPlaylist p_music;
 
@@ -54,64 +51,109 @@
     }
 
     private Gee.TreeSet<Media> open_media_list;
-
     private bool _doing_file_operations = false;
 
+    public Gda.Connection connection { public get; private set; }
+    private Gda.SqlParser parser;
+
+    private static const string DB_FILE = "database_0_3_1";
+
     public LocalLibrary () {
         libraries_manager.local_library = this;
         _playlists = new Gee.TreeSet<StaticPlaylist> ();
         _smart_playlists = new Gee.TreeSet<SmartPlaylist> ();
-        _medias = new Gee.TreeSet<Media> ();
+        _medias = new Gee.HashMap<int64?, Media> ((Gee.HashDataFunc<int64?>)GLib.int64_hash,
+                                                  (Gee.EqualDataFunc<int64?>?)GLib.int64_equal, null);
         _searched_medias = new Gee.TreeSet<Media> ();
         tagger = new GStreamerTagger();
         open_media_list = new Gee.TreeSet<Media> ();
         p_music = new StaticPlaylist ();
         p_music.name = MUSIC_PLAYLIST;
 
-        this.dbu = new DataBaseUpdater ();
         this.fo = new FileOperator ();
     }
 
     public override void initialize_library () {
-        var dbm = DataBaseManager.get_default ();
+        init_database ();
         fo.connect_to_manager ();
+
         // Load all media from database
-        lock (_medias) {
-            foreach (var m in dbm.load_media ()) {
-                _medias.add (m);
-            }
+        var media_ids = get_rowids_from_table (Database.Media.TABLE_NAME);
+        foreach (var media_id in media_ids) {
+            var m = new LocalMedia (media_id, connection);
+            _medias.set (m.rowid, m);
         }
 
-        // Load smart playlists from database
-        lock (_smart_playlists) {
-            foreach (var p in dbm.load_smart_playlists ()) {
-                _smart_playlists.add (p);
-                p.rowid = playlists_rowid;
-                playlists_rowid++;
-                p.updated.connect ((old_name) => {smart_playlist_updated (p, old_name);});
-            }
+        // Load all smart playlists from database
+        var sp_ids = get_rowids_from_table (Database.SmartPlaylists.TABLE_NAME);
+        foreach (var sp_id in sp_ids) {
+            var sp = new LocalSmartPlaylist (sp_id, connection);
+            _smart_playlists.add (sp);
         }
 
         // Load all static playlists from database
-
-        lock (_playlists) {
-            foreach (var p in dbm.load_playlists ()) {
-                if (p.name == C_("Name of the playlist", "Queue") || p.name == _("History")) {
-                    continue;
-                } else if (p.name != MUSIC_PLAYLIST) {
-                    _playlists.add (p);
-                    p.rowid = playlists_rowid;
-                    playlists_rowid++;
-                    p.updated.connect ((old_name) => {playlist_updated (p, old_name);});
-                    continue;
-                }
-            }
+        var p_ids = get_rowids_from_table (Database.Playlists.TABLE_NAME);
+        foreach (var p_id in p_ids) {
+            var p = new LocalStaticPlaylist (p_id, connection);
+            _playlists.add (p);
         }
 
-        DeviceManager.get_default ().set_device_preferences (dbm.load_devices ());
         load_media_art_cache.begin ();
     }
 
+    /*
+     * Database interaction
+     */
+    private void init_database () {
+        var database_dir = FileUtils.get_data_directory ();
+        try {
+            database_dir.make_directory_with_parents (null);
+        } catch (GLib.Error err) {
+            if (err is IOError.EXISTS == false)
+                error ("Could not create data directory: %s", err.message);
+        }
+
+        var db_file = database_dir.get_child (DB_FILE + ".db");
+        bool new_db = !db_file.query_exists ();
+        if (new_db) {
+            try {
+                db_file.create (FileCreateFlags.PRIVATE);
+            } catch (Error e) {
+                critical ("Error: %s", e.message);
+            }
+        }
+
+        try {
+            connection = new Gda.Connection.from_string ("SQLite", "DB_DIR=%s;DB_NAME=%s".printf (database_dir.get_path (), DB_FILE), null, Gda.ConnectionOptions.NONE);
+            connection.open ();
+        } catch (Error e) {
+            error (e.message);
+        }
+
+        parser = connection.create_parser ();
+
+        if (new_db) {
+            load_table (Database.Tables.PLAYLISTS);
+            load_table (Database.Tables.SMART_PLAYLISTS);
+            load_table (Database.Tables.COLUMNS);
+            load_table (Database.Tables.MEDIA);
+            load_table (Database.Tables.DEVICES);
+            LocalSmartPlaylist.add_defaults (connection);
+        }
+    }
+
+    private void load_table (string table) {
+        try {
+            var statement = parser.parse_string (table, null);
+            connection.statement_execute_non_select (statement, null, null);
+        } catch (Error e) {
+            critical (e.message);
+        }
+    }
+
+    /*
+     * Media art utilities.
+     */
     private async void load_media_art_cache () {
         lock (_medias) {
             yield CoverartCache.instance.load_for_media_async (get_medias ());
@@ -135,7 +177,7 @@
     }
     
     public void remove_all_static_playlists () {
-        var list = new Gee.TreeSet<int> ();
+        var list = new Gee.TreeSet<int64?> ();
         lock (_playlists) {
             foreach (var p in _playlists) {
                 if (p.read_only == false)
@@ -158,9 +200,8 @@
 
             clear_medias ();
 
-            App.player.unqueue_media (_medias);
+            App.player.unqueue_media (_medias.values);
 
-            App.player.reset_already_played ();
             // FIXME: these are library window's internals. Shouldn't be here
             App.main_window.update_sensitivities.begin ();
             App.player.stop_playback ();
@@ -339,7 +380,7 @@
         return result;
     }
 
-    public override StaticPlaylist? playlist_from_id (int id) {
+    public override StaticPlaylist? playlist_from_id (int64 id) {
         lock (_playlists) {
             foreach (var p in get_playlists ()) {
                 if (p.rowid == id) {
@@ -367,34 +408,54 @@
     }
 
     public override void add_playlist (StaticPlaylist p) {
-        lock (_playlists) {
-            _playlists.add (p);
-        }
-        p.rowid = playlists_rowid;
-        playlists_rowid++;
-        p.updated.connect ((old_name) => {playlist_updated (p, old_name);});
-        DataBaseManager.get_default ().add_playlist (p);
-        playlist_added (p);
-        debug ("playlist %s added",p.name);
+        string rv = "";
+        foreach (var m in p.medias) {
+            if (rv == "") {
+                rv = "%lld".printf (m.rowid);
+            } else {
+                rv += ";%lld".printf (m.rowid);
+            }
+        }
+
+        try {
+            var builder = new Gda.SqlBuilder (Gda.SqlStatementType.INSERT);
+            builder.set_table (Database.Playlists.TABLE_NAME);
+            builder.add_field_value_as_gvalue ("name", Database.make_string_value (p.name));
+            builder.add_field_value_as_gvalue ("media", Database.make_string_value (rv));
+            var statement = builder.get_statement ();
+            Gda.Set last_insert_row;
+            connection.statement_execute_non_select (statement, null, out last_insert_row);
+            var local_p = new LocalStaticPlaylist (last_insert_row.get_holder_value (Database.Playlists.ROWID).get_int64 (), connection);
+
+            lock (_playlists) {
+                _playlists.add (local_p);
+            }
+
+            playlist_added (local_p);
+            debug ("playlist %s added", local_p.name);
+        } catch (Error e) {
+            critical (e.message);
+        }
     }
 
-    public override void remove_playlist (int id) {
+    public override void remove_playlist (int64 id) {
         lock (_playlists) {
             foreach (var playlist in get_playlists ()) {
                 if (playlist.rowid == id) {
                     _playlists.remove (playlist);
-                    dbu.removeItem.begin (playlist);
                     playlist_removed (playlist);
                     break;
                 }
             }
+
+            try {
+                connection.delete_row_from_table (Database.Playlists.TABLE_NAME, "rowid", Database.make_int64_value (id));
+            } catch (Error e) {
+                critical (e.message);
+            }
         }
     }
 
-    public void playlist_updated (StaticPlaylist p, string? old_name = null) {
-        dbu.save_playlist (p, old_name);
-    }
-
     /*
      * Smart playlists
      */
@@ -409,7 +470,7 @@
         return result;
     }
 
-    public override SmartPlaylist? smart_playlist_from_id (int id) {
+    public override SmartPlaylist? smart_playlist_from_id (int64 id) {
         lock (_smart_playlists) {
             foreach (var p in get_smart_playlists ()) {
                 if (p.rowid == id) {
@@ -433,69 +494,133 @@
         return null;
     }
 
-    public async void save_smart_playlists () {
-        lock (_smart_playlists) {
-            DataBaseManager.get_default ().save_smart_playlists (get_smart_playlists ());
-        }
-    }
-
     public override void add_smart_playlist (SmartPlaylist p) {
-        lock (_smart_playlists) {
-            _smart_playlists.add (p);
+        try {
+            var builder = new Gda.SqlBuilder (Gda.SqlStatementType.INSERT);
+            builder.set_table (Database.SmartPlaylists.TABLE_NAME);
+            builder.add_field_value_as_gvalue ("name", Database.make_string_value (p.name));
+            var statement = builder.get_statement ();
+            Gda.Set last_insert_row;
+            connection.statement_execute_non_select (statement, null, out last_insert_row);
+            if (last_insert_row != null) {
+                var local_sp = new LocalSmartPlaylist (last_insert_row.get_holder_value (Database.SmartPlaylists.ROWID).get_int64 (), connection);
+                local_sp.conditional = p.conditional;
+                local_sp.limit = p.limit;
+                local_sp.limit_amount = p.limit_amount;
+                local_sp.add_queries (p.get_queries ());
+
+                lock (_smart_playlists) {
+                    _smart_playlists.add (local_sp);
+                }
+
+                smartplaylist_added (local_sp);
+            }
+        } catch (Error e) {
+            critical (e.message);
         }
-
-        p.rowid = playlists_rowid;
-        playlists_rowid++;
-        DataBaseManager.get_default ().save_smart_playlist (p);
-        p.updated.connect ((old_name) => {smart_playlist_updated (p, old_name);});
-        smartplaylist_added (p);
     }
 
-    public override void remove_smart_playlist (int id) {
+    public override void remove_smart_playlist (int64 id) {
         lock (_smart_playlists) {
             foreach (var p in get_smart_playlists ()) {
                 if (p.rowid == id) {
                     _smart_playlists.remove (p);
                     smartplaylist_removed (p);
-                    dbu.removeItem.begin (p);
                     break;
                 }
             }
         }
-    }
-
-    public void smart_playlist_updated (SmartPlaylist p, string? old_name = null) {
-        dbu.save_smart_playlist (p, old_name);
-    }
+
+        try {
+            connection.delete_row_from_table (Database.SmartPlaylists.TABLE_NAME, "rowid", Database.make_int64_value (id));
+        } catch (Error e) {
+            critical (e.message);
+        }
+    }
+
 
     /******************** Media stuff ******************/
     
     public override void search_medias (string search) {
-        lock (_searched_medias) {
-            _searched_medias.clear ();
-            if (search == "") {
-                _searched_medias.add_all (_medias);
-                search_finished ();
-                return;
-            }
-
-            int parsed_rating;
-            string parsed_search_string;
-            String.base_search_method (search, out parsed_rating, out parsed_search_string);
-            bool rating_search = parsed_rating > 0;
-            lock (_medias) {
-                foreach (var m in _medias) {
-                    if (rating_search) {
-                        if (m.rating == (uint) parsed_rating)
-                            _searched_medias.add (m);
-                    } else if (Search.match_string_to_media (m, parsed_search_string)) {
-                        _searched_medias.add (m);
-                    }
-                }
-            }
-        }
-
-        search_finished ();
+        if (search == "") {
+            lock (_searched_medias) {
+                _searched_medias.clear ();
+                _searched_medias.add_all (_medias.values);
+            }
+            search_finished ();
+            return;
+        }
+
+        uint parsed_rating;
+        string parsed_search_string;
+        String.base_search_method (search, out parsed_rating, out parsed_search_string);
+        bool rating_search = parsed_rating > 0;
+        // If we search for a special rating, don't search for something else.
+        try {
+            if (parsed_rating > 0) {
+                var sql = new Gda.SqlBuilder (Gda.SqlStatementType.SELECT);
+                sql.select_add_target (Database.Media.TABLE_NAME, null);
+                sql.select_add_field ("rowid", null, null);
+                var id_field = sql.add_id ("rating");
+                var id_value = sql.add_expr_value (null, Database.make_uint_value (parsed_rating));
+                var id_cond = sql.add_cond (Gda.SqlOperatorType.GEQ, id_field, id_value, 0);
+                sql.set_where (id_cond);
+
+                var statm = sql.get_statement ();
+                var data_model = connection.statement_execute_select (statm, null);
+                var data_model_iter = data_model.create_iter ();
+                data_model_iter.move_to_row (-1);
+                var rowids = new Gee.TreeSet<int64?> ();
+                while (data_model_iter.move_next ()) {
+                    unowned Value? val = data_model_iter.get_value_at (0);
+                    rowids.add (val.get_int64 ());
+                }
+
+                var meds = medias_from_ids (rowids);
+                lock (_searched_medias) {
+                    _searched_medias.clear ();
+                    _searched_medias.add_all (meds);
+                }
+            } else {
+                var sql = new Gda.SqlBuilder (Gda.SqlStatementType.SELECT);
+                sql.select_add_target (Database.Media.TABLE_NAME, null);
+                sql.select_add_field ("rowid", null, null);
+                Gda.SqlBuilderId[] ids = null;
+
+                string[] fields = {"title", "artist", "composer", "album_artist", "album", "grouping", "comment"};
+                foreach (var field in fields) {
+                    var id_field = sql.add_id (field);
+                    var id_value = sql.add_expr_value (null, Database.make_string_value ("%"+search+"%"));
+                    ids += sql.add_cond (Gda.SqlOperatorType.LIKE, id_field, id_value, 0);
+                }
+
+                var id_cond = sql.add_cond_v (Gda.SqlOperatorType.OR, ids);
+                sql.set_where (id_cond);
+
+                var statm = sql.get_statement ();
+                var data_model = connection.statement_execute_select (statm, null);
+                var data_model_iter = data_model.create_iter ();
+                data_model_iter.move_to_row (-1);
+                var rowids = new Gee.TreeSet<int64?> ();
+                while (data_model_iter.move_next ()) {
+                    unowned Value? val = data_model_iter.get_value_at (0);
+                    rowids.add (val.get_int64 ());
+                }
+
+                var meds = medias_from_ids (rowids);
+                lock (_searched_medias) {
+                    _searched_medias.clear ();
+                    _searched_medias.add_all (meds);
+                }
+            }
+        } catch (Error e) {
+            critical ("Could not search for %s: %s", search, e.message);
+        }
+
+        Idle.add (() => {
+            search_finished ();
+            return GLib.Source.REMOVE;
+        });
     }
 
     public override Gee.Collection<Media> get_search_result () {
@@ -510,7 +635,7 @@
         // We really only want to clear the songs that are permanent and on the file system
         // Dont clear podcasts that link to a url, device media, temporary media, previews, songs
         var unset = new Gee.LinkedList<Media> ();
-        foreach (var s in _medias) {
+        foreach (var s in _medias.values) {
             if (!s.isTemporary && !s.isPreview)
                 unset.add (s);
         }
@@ -521,7 +646,7 @@
 
     public override Gee.Collection<Media> get_medias () {
         var result = new Gee.TreeSet<Media> ();
-        result.add_all (_medias);
+        result.add_all (_medias.values);
         return result;
     }
 
@@ -553,21 +678,14 @@
      * consistency
      */
 
-    public override Media? media_from_id (int id) {
-        lock (_medias) {
-            foreach (var m in _medias) {
-                if (m.rowid == id)
-                    return m;
-            }
-        }
-
-        return null;
+    public override Media? media_from_id (int64 id) {
+        return _medias.get (id);
     }
 
     public override Media? find_media (Media to_find) {
         Media? found = null;
         lock (_medias) {
-            foreach (var m in _medias) {
+            foreach (var m in _medias.values) {
                 if (to_find.title.down () == m.title.down () && to_find.artist.down () == m.artist.down ()) {
                     found = m;
                     break;
@@ -580,7 +698,7 @@
 
     public override Media? media_from_file (File file) {
         lock (_medias) {
-            foreach (var m in _medias) {
+            foreach (var m in _medias.values) {
                 if (m != null && m.file.equal (file))
                     return m;
             }
@@ -591,7 +709,7 @@
 
     public override Media? media_from_uri (string uri) {
         lock (_medias) {
-            foreach (var m in _medias) {
+            foreach (var m in _medias.values) {
                 if (m != null && m.uri == uri)
                     return m;
             }
@@ -600,15 +718,12 @@
         return null;
     }
 
-    public override Gee.Collection<Media> medias_from_ids (Gee.Collection<int> ids) {
+    public override Gee.Collection<Media> medias_from_ids (Gee.Collection<int64?> ids) {
         var media_collection = new Gee.TreeSet<Media> ();
-        lock (_medias) {
-            foreach (var m in _medias) {
-                if (ids.contains (m.rowid))
-                    media_collection.add (m);
-
-                if (media_collection.size == ids.size)
-                    break;
+        foreach (var id in ids) {
+            var m = _medias.get (id);
+            if (m != null) {
+                media_collection.add (m);
             }
         }
 
@@ -618,7 +733,7 @@
     public override Gee.Collection<Media> medias_from_uris (Gee.Collection<string> uris) {
         var media_collection = new Gee.LinkedList<Media> ();
         lock (_medias) {
-            foreach (var m in _medias) {
+            foreach (var m in _medias.values) {
                 if (uris.contains (m.uri))
                     media_collection.add (m);
                 if (media_collection.size == uris.size)
@@ -636,7 +751,7 @@
     }
 
     public override void add_medias (Gee.Collection<Media> new_media) {
-        if (new_media.size < 1) // happens more often than you would think
+        if (new_media.is_empty) // happens more often than you would think
             return;
 
         // make a copy of the media list so that it doesn't get modified before
@@ -644,21 +759,26 @@
         var media = new Gee.TreeSet<Media> ();
         media.add_all (new_media);
 
-        var local_media = DataBaseManager.get_default ().add_media (media);
-        _medias.add_all (local_media);
-        media_added (local_media.read_only_view);
+        var local_media = new Gee.HashMap<int64?, LocalMedia> ();
+        foreach (var m in media) {
+            var local_m = new LocalMedia.from_media (connection, m);
+            local_media.set (local_m.rowid, local_m);
+        }
+
+        _medias.set_all (local_media);
+        media_added (local_media.values.read_only_view);
 
         // Update search results
         if (App.main_window.searchField.text == "") {
-            _searched_medias.add_all (local_media);
+            _searched_medias.add_all (local_media.values);
         } else {
-            int parsed_rating;
+            uint parsed_rating;
             string parsed_search_string;
             String.base_search_method (App.main_window.searchField.text, out parsed_rating, out parsed_search_string);
             bool rating_search = parsed_rating > 0;
-            foreach (var m in local_media) {
+            foreach (var m in local_media.values) {
                 if (rating_search) {
-                    if (m.rating == (uint) parsed_rating)
+                    if (m.rating == parsed_rating)
                         _searched_medias.add (m);
                 } else if (Search.match_string_to_media (m, parsed_search_string)) {
                     _searched_medias.add (m);
@@ -678,10 +798,8 @@
     public override void remove_medias (Gee.Collection<Media> to_remove, bool trash) {
         var toRemove = new Gee.TreeSet<Media> ();
         toRemove.add_all (to_remove);
-        foreach (var s in toRemove) {
-            if (s == App.player.current_media)
-                App.player.stop_playback ();
-        }
+        if (App.player.current_media in toRemove)
+            App.player.stop_playback ();
 
         if (trash)
             fo.remove_media (toRemove);
@@ -689,12 +807,11 @@
         // Emit signal before actually removing the media because otherwise
         // media_from_id () and media_from_ids () wouldn't work.
         media_removed (toRemove.read_only_view);
-        dbu.removeItem.begin (toRemove);
 
         lock (_medias) {
             foreach (Media s in toRemove) {
                 _searched_medias.remove (s);
-                _medias.remove (s);
+                _medias.unset (s.rowid);
             }
         }
 
@@ -703,17 +820,25 @@
                 p.remove_medias (toRemove);
         }
 
-        DataBaseManager.get_default ().remove_media (toRemove);
+        foreach (var m in toRemove) {
+            try {
+                connection.delete_row_from_table (Database.Media.TABLE_NAME, "rowid", Database.make_int64_value (m.rowid));
+            } catch (Error e) {
+                critical (e.message);
+            }
+        }
+
         search_finished ();
     }
 
     public Gee.TreeSet<Noise.Media> answer_to_device_sync (Device device) {
         var medias_to_sync = new Gee.TreeSet<Noise.Media> ();
-        if (device.get_preferences ().sync_music == true) {
-            if (device.get_preferences ().sync_all_music == true) {
+        var prefs = get_preferences_for_device (device);
+        if (prefs.sync_music == true) {
+            if (prefs.sync_all_music == true) {
                 medias_to_sync.add_all (get_medias ());
             } else {
-                medias_to_sync.add_all (device.get_preferences ().music_playlist.medias);
+                medias_to_sync.add_all (prefs.music_playlist.medias);
             }
         }
 
@@ -744,4 +869,35 @@
         file_operations_done ();
         update_media_art_cache.begin ();
     }
+
+    Gee.HashMap<string, DevicePreferences> preferences = new Gee.HashMap<string, DevicePreferences> ((Gee.HashDataFunc)GLib.str_hash, (Gee.EqualDataFunc)GLib.str_equal);
+    public DevicePreferences get_preferences_for_device (Device d) {
+        var key = d.get_unique_identifier ();
+        if (preferences.has_key (key)) {
+            return preferences.get (key);
+        } else {
+            var pref = new DevicePreferences (d, connection);
+            preferences.set (key, pref);
+            return pref;
+        }
+    }
+
+    private Gee.Collection<int64?> get_rowids_from_table (string table_name) {
+        var ids = new Gee.TreeSet<int64?> ();
+        try {
+            var builder = new Gda.SqlBuilder (Gda.SqlStatementType.SELECT);
+            builder.select_add_target (table_name, null);
+            builder.select_add_field ("rowid", null, null);
+            var data_model = connection.statement_execute_select (builder.get_statement (), null);
+            for (int i = 0; i < data_model.get_n_rows (); i++) {
+                var rowid = data_model.get_value_at (data_model.get_column_index ("rowid"), i);
+                ids.add (rowid.get_int64 ());
+            }
+        } catch (Error e) {
+            // TODO: Expose errors to the user !
+            critical ("Could not query table %s : %s", table_name, e.message);
+        }
+
+        return ids;
+    }
 }

=== modified file 'src/LocalBackend/LocalMedia.vala'
--- src/LocalBackend/LocalMedia.vala	2015-02-24 18:16:35 +0000
+++ src/LocalBackend/LocalMedia.vala	2015-08-27 10:21:27 +0000
@@ -29,8 +29,6 @@
  */
 
 public class Noise.LocalMedia : Noise.Media {
-    private SQLHeavy.Database database = Noise.DataBaseManager.get_default ().database;
-
     private uint64? _file_size = null;
     public override uint64 file_size {
         get {
@@ -66,6 +64,7 @@
             common_uint_setter ("track", value, ref _track);
         }
     }
+
     private uint? _track_count = null;
     public override uint track_count {
         get {
@@ -76,6 +75,7 @@
             common_uint_setter ("track_count", value, ref _track_count);
         }
     }
+
     private string _composer = null;
     public override string composer {
         get {
@@ -86,6 +86,7 @@
             common_string_setter ("composer", value, ref _composer);
         }
     }
+
     private string _artist = null;
     public override string artist {
         get {
@@ -96,6 +97,7 @@
             common_string_setter ("artist", value, ref _artist);
         }
     }
+
     private string _album_artist = null;
     public override string album_artist {
         get {
@@ -106,6 +108,7 @@
             common_string_setter ("album_artist", value, ref _album_artist);
         }
     }
+
     private string _album = null;
     public override string album {
         get {
@@ -116,6 +119,7 @@
             common_string_setter ("album", value, ref _album);
         }
     }
+
     private uint? _album_number = null;
     public override uint album_number {
         get {
@@ -126,6 +130,7 @@
             common_uint_setter ("album_number", value, ref _album_number);
         }
     }
+
     private uint? _album_count = null;
     public override uint album_count {
         get {
@@ -136,6 +141,7 @@
             common_uint_setter ("album_count", value, ref _album_count);
         }
     }
+
     public override unowned Album album_info { get; set; default = null; }
     private string _grouping = null;
     public override string grouping {
@@ -147,6 +153,7 @@
             common_string_setter ("grouping", value, ref _grouping);
         }
     }
+
     private string _genre = null;
     public override string genre {
         get {
@@ -157,6 +164,7 @@
             common_string_setter ("genre", value, ref _genre);
         }
     }
+
     private string _comment = null;
     public override string comment {
         get {
@@ -167,6 +175,7 @@
             common_string_setter ("comment", value, ref _comment);
         }
     }
+
     private string _lyrics = null;
     public override string lyrics {
         get {
@@ -177,6 +186,7 @@
             common_string_setter ("lyrics", value, ref _lyrics);
         }
     }
+
     public uint? _year = null;
     public override uint year {
         get {
@@ -187,6 +197,7 @@
             common_uint_setter ("year", value, ref _year);
         }
     }
+
     public uint? _bitrate = null;
     public override uint bitrate {
         get {
@@ -197,6 +208,7 @@
             common_uint_setter ("bitrate", value, ref _bitrate);
         }
     }
+