Merge lp:~marcus-lundgren/noise/compilation_warnings_and_clean_up into lp:~elementary-apps/noise/trunk

[Marcus Lundgren]

Fixed some compilation warnings and removed some commented out code.

Fixed some compilation warnings and removed some commented out code.

[David Gomes (davidgomes)]

>val = Sequence<string>.get ( ( (SequenceIter<string>) iter.user_data));

Always put a space before a parenthese '(' unless there are two or more in a row, so the above line should be:

>val = Sequence<string>.get (((SequenceIter<string>) iter.user_data));

Another example:

success = GPod.iTunesDB.cp_track_to_ipod(added, File.new_for_uri(s.uri).get_path());
↓
success = GPod.iTunesDB.cp_track_to_ipod (added, File.new_for_uri (s.uri).get_path ());

Also, you're mixing tabs and spaces for indentation, I know it's not entirely your fault, because the file was probably a mess already, but if you could turn all to spaces (or all to tabs if that's what tintou is using), I'd really like it.

review: Needs Fixing

[lp:~marcus-lundgren/noise/compilation_warnings_and_clean_up]

1501. By Marcus Lundgren on 2013-07-26

Turn tabs to spaces and fix some legacy code style issues.

[Marcus Lundgren (marcus-lundgren)]

The tabs have been turned into spaces (as this seems to be the standard in the files in src/.

I fixed the code style issues on the lines that I've actually touched, which excludes the lines that only had tabs turned into spaces. The code style issues on the other lines weren't fixed, as the intent of the branch was to only fix compilation warnings, and the issues should therefor be fixed in a separate branch.

[David Gomes (davidgomes)]

Yeah that's exactly what you should do, don't do mixed-actions per commit.

[David Gomes (davidgomes)]

I'm approving but I'll run a code style fix after this branch is merged and I need someone to confirm to me this builds on 12.04, since I'm on 13.04 and it doesn't build due to SQLHeavy errors.

review: Approve

[Julián Unrrein (junrrein)]

I test-compiled this branch on elementary Luna, with no problems.

Here is the configuration and compilation logs -> http://pastebin.com/QxxskuEb.

=== modified file 'core/GStreamer/Pipeline.vala'
--- core/GStreamer/Pipeline.vala	2013-02-26 21:56:08 +0000
+++ core/GStreamer/Pipeline.vala	2013-07-26 20:46:25 +0000
@@ -29,91 +29,73 @@
  */
 
 public class Noise.Pipeline : GLib.Object {
-	public Gst.Pipeline pipe;
-	public Equalizer eq;
-	
-	public dynamic Gst.Bus bus;
-	//Pad teepad;
-	public Gst.Pad pad;
-	
-	public dynamic Gst.Element audiosink;
-	public dynamic Gst.Element audiosinkqueue;
-	public dynamic Gst.Element eq_audioconvert;
-	public dynamic Gst.Element eq_audioconvert2; 
-	 
-	public dynamic Gst.Element playbin;
-	public dynamic Gst.Element audiotee;
-	public dynamic Gst.Element audiobin;
-	public dynamic Gst.Element preamp;
-	//dynamic Gst.Element volume;
-	//dynamic Gst.Element rgvolume;
-	
-	public Pipeline() {
-		
-		pipe = new Gst.Pipeline("pipeline");
-		playbin = Gst.ElementFactory.make("playbin2", "play");
-		
-		audiosink = Gst.ElementFactory.make("autoaudiosink", "audio-sink");
-		//audiosink.set("profile", 1); // says we handle music and movies
-		
-		audiobin = new Gst.Bin("audiobin"); // this holds the real primary sink
-		
-		audiotee = Gst.ElementFactory.make("tee", null);
-		audiosinkqueue = Gst.ElementFactory.make("queue", null);
-		
-		eq = new Equalizer();
-		if(eq.element != null) {
-			eq_audioconvert = Gst.ElementFactory.make("audioconvert", null);
-			eq_audioconvert2 = Gst.ElementFactory.make("audioconvert", null);
-			preamp = Gst.ElementFactory.make("volume", "preamp");
-			
-			((Gst.Bin)audiobin).add_many(eq.element, eq_audioconvert, eq_audioconvert2, preamp);
-		}
-		
-		((Gst.Bin)audiobin).add_many(audiotee, audiosinkqueue, audiosink);
-		
-		audiobin.add_pad(new Gst.GhostPad("sink", audiotee.get_pad("sink")));
-		
-		if (eq.element != null)
-			audiosinkqueue.link_many(eq_audioconvert, preamp, eq.element, eq_audioconvert2, audiosink);
-		else
-			audiosinkqueue.link_many(audiosink); // link the queue with the real audio sink
-		
-		playbin.set("audio-sink", audiobin); 
-		bus = playbin.get_bus();
-		
-		// Link the first tee pad to the primary audio sink queue
-		Gst.Pad sinkpad = audiosinkqueue.get_pad("sink");
-		pad = audiotee.get_request_pad("src%d");
-		audiotee.set("alloc-pad", pad);
-		pad.link(sinkpad);
-		
-		//bus.add_watch(busCallback);
-		/*play.audio_tags_changed.connect(audioTagsChanged);
-		play.text_tags_changed.connect(textTagsChanged);*/
-	}
-
-/*
-	private void audioTagsChanged(Gst.Element sender, int stream_number) {
-		
-	}
-
-	/*private void textTagsChanged(Gst.Element sender, int stream_number) {
-		
-	}
-*/
-	
-	public void enableEqualizer() {
-		if (eq.element != null) {
-			audiosinkqueue.unlink_many(audiosink); // link the queue with the real audio sink
-			audiosinkqueue.link_many(eq_audioconvert, preamp, eq.element, eq_audioconvert2, audiosink);
-		}
-	}
-	
-	public void disableEqualizer() {
-		if (eq.element != null) {
-			audiosinkqueue.unlink_many(eq_audioconvert, preamp, eq.element, eq_audioconvert2, audiosink);
-			audiosinkqueue.link_many(audiosink); // link the queue with the real audio sink
-		}
-	}
+    public Gst.Pipeline pipe;
+    public Equalizer eq;
+    
+    public dynamic Gst.Bus bus;
+    public Gst.Pad pad;
+    
+    public dynamic Gst.Element audiosink;
+    public dynamic Gst.Element audiosinkqueue;
+    public dynamic Gst.Element eq_audioconvert;
+    public dynamic Gst.Element eq_audioconvert2; 
+     
+    public dynamic Gst.Element playbin;
+    public dynamic Gst.Element audiotee;
+    public dynamic Gst.Element audiobin;
+    public dynamic Gst.Element preamp;
+    
+    public Pipeline() {
+        
+        pipe = new Gst.Pipeline("pipeline");
+        playbin = Gst.ElementFactory.make("playbin2", "play");
+        
+        audiosink = Gst.ElementFactory.make("autoaudiosink", "audio-sink");
+        
+        audiobin = new Gst.Bin("audiobin"); // this holds the real primary sink
+        
+        audiotee = Gst.ElementFactory.make("tee", null);
+        audiosinkqueue = Gst.ElementFactory.make("queue", null);
+        
+        eq = new Equalizer();
+        if(eq.element != null) {
+            eq_audioconvert = Gst.ElementFactory.make("audioconvert", null);
+            eq_audioconvert2 = Gst.ElementFactory.make("audioconvert", null);
+            preamp = Gst.ElementFactory.make("volume", "preamp");
+            
+            ((Gst.Bin)audiobin).add_many(eq.element, eq_audioconvert, eq_audioconvert2, preamp);
+        }
+        
+        ((Gst.Bin)audiobin).add_many(audiotee, audiosinkqueue, audiosink);
+        
+        audiobin.add_pad(new Gst.GhostPad("sink", audiotee.get_pad("sink")));
+        
+        if (eq.element != null)
+            audiosinkqueue.link_many(eq_audioconvert, preamp, eq.element, eq_audioconvert2, audiosink);
+        else
+            audiosinkqueue.link_many(audiosink); // link the queue with the real audio sink
+        
+        playbin.set("audio-sink", audiobin); 
+        bus = playbin.get_bus();
+        
+        // Link the first tee pad to the primary audio sink queue
+        Gst.Pad sinkpad = audiosinkqueue.get_pad("sink");
+        pad = audiotee.get_request_pad("src%d");
+        audiotee.set("alloc-pad", pad);
+        pad.link(sinkpad);
+    }
+
+    public void enableEqualizer() {
+        if (eq.element != null) {
+            audiosinkqueue.unlink_many(audiosink); // link the queue with the real audio sink
+            audiosinkqueue.link_many(eq_audioconvert, preamp, eq.element, eq_audioconvert2, audiosink);
+        }
+    }
+    
+    public void disableEqualizer() {
+        if (eq.element != null) {
+            audiosinkqueue.unlink_many(eq_audioconvert, preamp, eq.element, eq_audioconvert2, audiosink);
+            audiosinkqueue.link_many(audiosink); // link the queue with the real audio sink
+        }
+    }
 }

=== modified file 'plugins/Devices/AudioPlayers/AudioPlayerLibrary.vala'
--- plugins/Devices/AudioPlayers/AudioPlayerLibrary.vala	2013-06-02 17:35:04 +0000
+++ plugins/Devices/AudioPlayers/AudioPlayerLibrary.vala	2013-07-26 20:46:25 +0000
@@ -55,13 +55,13 @@
     
         tagger = new GStreamerTagger();
         
-        tagger.media_imported.connect(media_imported);
-        tagger.import_error.connect(import_error);
-        tagger.queue_finished.connect(queue_finished);
+        tagger.media_imported.connect (media_imported_from_tagger);
+        tagger.import_error.connect (import_error);
+        tagger.queue_finished.connect (queue_finished);
         notification_manager.progress_canceled.connect( () => {operation_cancelled = true;});
     }
-    
-    void media_imported (Media m) {
+
+    void media_imported_from_tagger (Media m) {
         m.isTemporary = true;
         this.medias.add(m);
         m.rowid = medias_rowid;
@@ -80,7 +80,6 @@
             is_initialized = true;
             device.initialized (device);
             search_medias ("");
-            //load_playlists ();
         }
     }
     
@@ -88,26 +87,6 @@
         
     }
     
-    private void load_playlists () {
-        var imported_pl = new Gee.LinkedList<string> ();
-        FileUtils.count_playlists_files (GLib.File.new_for_uri (device.get_music_folder () + "/Playlists/"), ref imported_pl);
-        var playlists = new Gee.HashMap<string, Gee.LinkedList<string>> ();
-        foreach (var file in imported_pl) {
-            if(file != "") {
-                var f = GLib.File.new_for_uri (file);
-                var infos = f.query_info (GLib.FileAttribute.STANDARD_DISPLAY_NAME, FileQueryInfoFlags.NONE);
-                var name = infos.get_display_name ();
-                var paths = new Gee.LinkedList<string> ();
-                if (file.has_suffix(".m3u")) {
-                    name = name.replace (".m3u", "");
-                    PlaylistsUtils.parse_paths_from_m3u(file, ref paths);
-                }
-                playlists.set (name, paths);
-            }
-        }
-        PlaylistsUtils.import_from_playlist_file_info(playlists, this);
-    }
-    
     public override void add_files_to_library (Gee.Collection<string> files) {
     
     }

=== modified file 'plugins/Devices/iPod/iPodLibrary.vala'
--- plugins/Devices/iPod/iPodLibrary.vala	2013-06-02 17:35:04 +0000
+++ plugins/Devices/iPod/iPodLibrary.vala	2013-07-26 20:46:25 +0000
@@ -40,7 +40,6 @@
     Device device;
     bool operation_cancelled = false;
     bool is_doing_file_operations = false;
-    bool queue_is_finished = false;
     
     public iPodLibrary (GPod.iTunesDB db, Device device) {
         this.db = db;
@@ -202,7 +201,7 @@
         
         bool success = false;
         try {
-            success = db.cp_track_to_ipod(added, File.new_for_uri(s.uri).get_path());
+            success = GPod.iTunesDB.cp_track_to_ipod (added, File.new_for_uri (s.uri).get_path ());
             debug ("Copied media %s to ipod\n", added.title);
         } catch(Error err) {
             warning ("Error adding/copying song %s to iPod: %s\n", s.title, err.message);

=== modified file 'src/Views/ListView/ColumnBrowser/BrowserColumnModel.vala'
--- src/Views/ListView/ColumnBrowser/BrowserColumnModel.vala	2013-06-25 18:24:42 +0000
+++ src/Views/ListView/ColumnBrowser/BrowserColumnModel.vala	2013-07-26 20:46:25 +0000
@@ -20,350 +20,350 @@
 using Gtk;
 
 public class Noise.BrowserColumnModel : Object, TreeModel, TreeSortable {
-	/* all iters must match this */
-	private int stamp = (int)Random.next_int ();
-
-	public int n_items { get { return rows.get_length () - 1; } } // Doesn't count the first ("All..") item
-
-	/* data storage variables */
-	private Sequence<string> rows;
-
-	/* first iter. This helps us to track the "All" row */
-	TreeIter? first_iter;
-
-	/* treesortable stuff */
-	private int sort_column_id;
-	private SortType sort_direction;
-	private unowned TreeIterCompareFunc default_sort_func;
-
-	private BrowserColumn.Category category;
-
-	/** Initialize data storage, columns, etc. **/
-	public BrowserColumnModel (BrowserColumn.Category category) {
-		rows = new Sequence<string> ();
-
-		this.category = category;
-
-		sort_column_id = -2;
-		sort_direction = SortType.ASCENDING;
-	}
-
-	/** Returns a set of flags supported by this interface **/
-	public TreeModelFlags get_flags () {
-		return TreeModelFlags.LIST_ONLY;
-	}
-
-	/** Sets iter to a valid iterator pointing to path **/
-	public bool get_iter (out TreeIter iter, TreePath path) {
-		iter = TreeIter ();
-		int path_index = path.get_indices ()[0];
-
-		if (rows.get_length () == 0 || path_index < 0 || path_index >= rows.get_length ())
-			return false;
-
-		var seq_iter = rows.get_iter_at_pos (path_index);
-		if (seq_iter == null)
-			return false;
-
-		iter.stamp = this.stamp;
-		iter.user_data = seq_iter;
-
-		return true;
-	}
-
-	/** Returns the number of columns supported by tree_model. **/
-	public int get_n_columns () {
-		return 1;
-	}
-
-	public Type get_column_type (int col) {
-		return typeof (string);
-	}
-
-	/** Returns a newly-created Gtk.TreePath referenced by iter. **/
-	public TreePath? get_path (TreeIter iter) {
-		return new TreePath.from_string ( ( (SequenceIter)iter.user_data).get_position ().to_string ());
-	}
-
-	/** Initializes and sets value to that at column. **/
-	public void get_value (TreeIter iter, int column, out Value val) {
-		val = Value (typeof (string));
-		if (iter.stamp != this.stamp || column < 0 || column >= 1)
-			return;
-
-		if (! ( (SequenceIter<string>) iter.user_data).is_end ())
-			val = rows.get ( ( (SequenceIter<string>) iter.user_data));
-	}
-
-	/** Sets iter to point to the first child of parent. **/
-	public bool iter_children (out TreeIter iter, TreeIter? parent) {
-		iter = TreeIter ();
-
-		return false;
-	}
-
-	/** Returns true if iter has children, false otherwise. **/
-	public bool iter_has_child (TreeIter iter) {
-
-		return false;
-	}
-
-	/** Returns the number of children that iter has. **/
-	public int iter_n_children (TreeIter? iter) {
-		if (iter == null)
-			return rows.get_length ();
-
-		return 0;
-	}
-
-	/** Sets iter to point to the node following it at the current level. **/
-	public bool iter_next (ref TreeIter iter) {
-		if (iter.stamp != this.stamp)
-			return false;
-
-		iter.user_data = ( (SequenceIter)iter.user_data).next ();
-
-		if ( ( (SequenceIter)iter.user_data).is_end ())
-			return false;
-
-		return true;
-	}
-
-	/** Sets iter to be the child of parent, using the given index. **/
-	public bool iter_nth_child (out TreeIter iter, TreeIter? parent, int n) {
-		iter = TreeIter ();
-		if (n < 0 || n >= rows.get_length () || parent != null)
-			return false;
-
-		iter.stamp = this.stamp;
-		iter.user_data = rows.get_iter_at_pos (n);
-
-		return true;
-	}
-
-	/** Sets iter to be the parent of child. **/
-	public bool iter_parent (out TreeIter iter, TreeIter child) {
-		iter = TreeIter ();
-
-		return false;
-	}
-
-	/** Lets the tree ref the node. **/
-	public void ref_node (TreeIter iter) {}
-
-	/** Lets the tree unref the node. **/
-	public void unref_node (TreeIter iter) {}
-
-	/** simply adds iter to the model **/
-	public void append (out TreeIter iter) {
-		iter = TreeIter ();
-		SequenceIter<string> added = rows.append ("");
-		iter.stamp = this.stamp;
-		iter.user_data = added;
-	}
-
-	/** convenience method to insert strings into the model. No iters returned. **/
-	public void append_items (Gee.Collection<string> strings, bool emit) {
+    /* all iters must match this */
+    private int stamp = (int)Random.next_int ();
+
+    public int n_items { get { return rows.get_length () - 1; } } // Doesn't count the first ("All..") item
+
+    /* data storage variables */
+    private Sequence<string> rows;
+
+    /* first iter. This helps us to track the "All" row */
+    TreeIter? first_iter;
+
+    /* treesortable stuff */
+    private int sort_column_id;
+    private SortType sort_direction;
+    private unowned TreeIterCompareFunc default_sort_func;
+
+    private BrowserColumn.Category category;
+
+    /** Initialize data storage, columns, etc. **/
+    public BrowserColumnModel (BrowserColumn.Category category) {
+        rows = new Sequence<string> ();
+
+        this.category = category;
+
+        sort_column_id = -2;
+        sort_direction = SortType.ASCENDING;
+    }
+
+    /** Returns a set of flags supported by this interface **/
+    public TreeModelFlags get_flags () {
+        return TreeModelFlags.LIST_ONLY;
+    }
+
+    /** Sets iter to a valid iterator pointing to path **/
+    public bool get_iter (out TreeIter iter, TreePath path) {
+        iter = TreeIter ();
+        int path_index = path.get_indices ()[0];
+
+        if (rows.get_length () == 0 || path_index < 0 || path_index >= rows.get_length ())
+            return false;
+
+        var seq_iter = rows.get_iter_at_pos (path_index);
+        if (seq_iter == null)
+            return false;
+
+        iter.stamp = this.stamp;
+        iter.user_data = seq_iter;
+
+        return true;
+    }
+
+    /** Returns the number of columns supported by tree_model. **/
+    public int get_n_columns () {
+        return 1;
+    }
+
+    public Type get_column_type (int col) {
+        return typeof (string);
+    }
+
+    /** Returns a newly-created Gtk.TreePath referenced by iter. **/
+    public TreePath? get_path (TreeIter iter) {
+        return new TreePath.from_string ( ( (SequenceIter)iter.user_data).get_position ().to_string ());
+    }
+
+    /** Initializes and sets value to that at column. **/
+    public void get_value (TreeIter iter, int column, out Value val) {
+        val = Value (typeof (string));
+        if (iter.stamp != this.stamp || column < 0 || column >= 1)
+            return;
+
+        if (! ( (SequenceIter<string>) iter.user_data).is_end ())
+            val = Sequence<string>.get (((SequenceIter<string>) iter.user_data));
+    }
+
+    /** Sets iter to point to the first child of parent. **/
+    public bool iter_children (out TreeIter iter, TreeIter? parent) {
+        iter = TreeIter ();
+
+        return false;
+    }
+
+    /** Returns true if iter has children, false otherwise. **/
+    public bool iter_has_child (TreeIter iter) {
+
+        return false;
+    }
+
+    /** Returns the number of children that iter has. **/
+    public int iter_n_children (TreeIter? iter) {
+        if (iter == null)
+            return rows.get_length ();
+
+        return 0;
+    }
+
+    /** Sets iter to point to the node following it at the current level. **/
+    public bool iter_next (ref TreeIter iter) {
+        if (iter.stamp != this.stamp)
+            return false;
+
+        iter.user_data = ( (SequenceIter)iter.user_data).next ();
+
+        if ( ( (SequenceIter)iter.user_data).is_end ())
+            return false;
+
+        return true;
+    }
+
+    /** Sets iter to be the child of parent, using the given index. **/
+    public bool iter_nth_child (out TreeIter iter, TreeIter? parent, int n) {
+        iter = TreeIter ();
+        if (n < 0 || n >= rows.get_length () || parent != null)
+            return false;
+
+        iter.stamp = this.stamp;
+        iter.user_data = rows.get_iter_at_pos (n);
+
+        return true;
+    }
+
+    /** Sets iter to be the parent of child. **/
+    public bool iter_parent (out TreeIter iter, TreeIter child) {
+        iter = TreeIter ();
+
+        return false;
+    }
+
+    /** Lets the tree ref the node. **/
+    public void ref_node (TreeIter iter) {}
+
+    /** Lets the tree unref the node. **/
+    public void unref_node (TreeIter iter) {}
+
+    /** simply adds iter to the model **/
+    public void append (out TreeIter iter) {
+        iter = TreeIter ();
+        SequenceIter<string> added = rows.append ("");
+        iter.stamp = this.stamp;
+        iter.user_data = added;
+    }
+
+    /** convenience method to insert strings into the model. No iters returned. **/
+    public void append_items (Gee.Collection<string> strings, bool emit) {
         if (first_iter == null)
-    		add_first_element ();
-
-		foreach (string s in strings) {
-			SequenceIter<string> added = rows.append (s);
-
-			if (emit) {
-				var path = new TreePath.from_string (added.get_position ().to_string ());
-				var iter = TreeIter ();
-
-				iter.stamp = this.stamp;
-				iter.user_data = added;
-
-				row_inserted (path, iter);
-			}
-		}
-
-		update_first_item ();
-	}
-
-	/* Add the "All" item */
-	private void add_first_element () {
-		SequenceIter<string> added = rows.append ("All");
-
-		first_iter = TreeIter ();
-
-		first_iter.stamp = this.stamp;
-		first_iter.user_data = added;
-	}
-
-	/* Updates the "All" item */
-	private void update_first_item () {
-		rows.set ( (SequenceIter<string>)first_iter.user_data, get_first_item_text (n_items));
-	}
-
-
-	// The text to use for the first item.
-	private string get_first_item_text (int n_items) {
-		string rv = "";
-
-		switch (category) {
-			case BrowserColumn.Category.GENRE:
-				if (n_items == 1)
-					rv = _ ("All Genres");
-				else if (n_items > 1)
-					rv = _ ("All %i Genres").printf (n_items);
-				else
-					rv = _ ("No Genres");
-			break;
-
-			case BrowserColumn.Category.ARTIST:
-				if (n_items == 1)
-					rv = _ ("All Artists");
-				else if (n_items > 1)
-					rv = _ ("All %i Artists").printf (n_items);
-				else
-					rv = _ ("No Artists");
-			break;
-
-			case BrowserColumn.Category.ALBUM:
-				if (n_items == 1)
-					rv = _ ("All Albums");
-				else if (n_items > 1)
-					rv = _ ("All %i Albums").printf (n_items);
-				else
-					rv = _ ("No Albums");
-			break;
-
-			case BrowserColumn.Category.YEAR:
-				if (n_items == 1)
-					rv = _ ("All Years");
-				else if (n_items > 1)
-					rv = _ ("All %i Years").printf (n_items);
-				else
-					rv = _ ("No Years");
-			break;
-
-			case BrowserColumn.Category.RATING:
-				if (n_items >= 1)
-					rv = _ ("All Ratings");
-				else
-					rv = _ ("No Ratings");
-			break;
-
-			case BrowserColumn.Category.GROUPING:
-				if (n_items == 1)
-					rv = _ ("All Groupings");
-				else if (n_items > 1)
-					rv = _ ("All %i Groupings").printf (n_items);
-				else
-					rv = _ ("No Groupings");
-			break;
-
-			case BrowserColumn.Category.COMPOSER:
-				if (n_items == 1)
-					rv = _ ("All Composers");
-				else if (n_items > 1)
-					rv = _ ("All %i Composers").printf (n_items);
-				else
-					rv = _ ("No Composers");
-			break;
-		}
-
-		return rv;
-	}
-
-
-	public new void set (TreeIter iter, ...) {
-		if (iter.stamp != this.stamp)
-			return;
-
-		var args = va_list (); // now call args.arg () to poll
-
-		while (true) {
-			int col = args.arg ();
-			if (col < 0 || col >= 1)
-				return;
-			else if (col == 0) {
-				string val = args.arg ();
-				rows.set ( (SequenceIter<string>)iter.user_data, val);
-			}
-		}
-	}
-
-	public void remove (TreeIter iter) {
-		if (iter.stamp != this.stamp)
-			return;
-
-		var path = new TreePath.from_string ( ( (SequenceIter)iter.user_data).get_position ().to_string ());
-		rows.remove ( (SequenceIter<string>)iter.user_data);
-		row_deleted (path);
-	}
-
-	/** Fills in sort_column_id and order with the current sort column and the order. **/
-	public bool get_sort_column_id (out int sort_column_id, out SortType order) {
-		sort_column_id = this.sort_column_id;
-		order = sort_direction;
-
-		return true;
-	}
-
-	/** Returns true if the model has a default sort function. **/
-	public bool has_default_sort_func () {
-		return (default_sort_func != null);
-	}
-
-	/** Sets the default comparison function used when sorting to be sort_func. **/
-	public void set_default_sort_func (owned TreeIterCompareFunc sort_func) {
-		default_sort_func = sort_func;
-	}
-
-	/** Sets the current sort column to be sort_column_id. **/
-	public void set_sort_column_id (int sort_column_id, SortType order) {
-		bool changed = (this.sort_column_id != sort_column_id || order != sort_direction);
-
-		this.sort_column_id = sort_column_id;
-		sort_direction = order;
-
-		if (changed && sort_column_id >= 0) {
-			/* do the sort for reals */
-			rows.sort_iter (sequenceIterCompareFunc);
-
-			sort_column_changed ();
-		}
-	}
-
-	public void set_sort_func (int sort_column_id, owned TreeIterCompareFunc sort_func) {
-
-	}
-
-
-	/** Custom function to use built in sort in Sequence to our advantage **/
-	public int sequenceIterCompareFunc (SequenceIter<string> a, SequenceIter<string> b) {
-		int rv = 1;
-
-		if (sort_column_id < 0)
-			return 0;
-
-		if (sort_column_id == 0) {
-			var first_sequence_iter = (SequenceIter)first_iter.user_data;
-
-			// "All" is always the first
-			if (a == first_sequence_iter) {
-				rv = -1;
-			}
-			else if (b == first_sequence_iter) {
-				rv = 1;
-			}
-			else {
-			    if (category == BrowserColumn.Category.ARTIST || category == BrowserColumn.Category.ALBUM)
-			        rv = String.compare (rows.get (a), rows.get (b));
-		        else
-				    rv = String.compare (rows.get (a), rows.get (b));
-			}
-		}
-
-		if (sort_direction == SortType.DESCENDING)
-			rv = (rv > 0) ? -1 : 1;
-
-		return rv;
-	}
+            add_first_element ();
+
+        foreach (string s in strings) {
+            SequenceIter<string> added = rows.append (s);
+
+            if (emit) {
+                var path = new TreePath.from_string (added.get_position ().to_string ());
+                var iter = TreeIter ();
+
+                iter.stamp = this.stamp;
+                iter.user_data = added;
+
+                row_inserted (path, iter);
+            }
+        }
+
+        update_first_item ();
+    }
+
+    /* Add the "All" item */
+    private void add_first_element () {
+        SequenceIter<string> added = rows.append ("All");
+
+        first_iter = TreeIter ();
+
+        first_iter.stamp = this.stamp;
+        first_iter.user_data = added;
+    }
+
+    /* Updates the "All" item */
+    private void update_first_item () {
+        Sequence<string>.set ( (SequenceIter<string>)first_iter.user_data, get_first_item_text (n_items));
+    }
+
+
+    // The text to use for the first item.
+    private string get_first_item_text (int n_items) {
+        string rv = "";
+
+        switch (category) {
+            case BrowserColumn.Category.GENRE:
+                if (n_items == 1)
+                    rv = _ ("All Genres");
+                else if (n_items > 1)
+                    rv = _ ("All %i Genres").printf (n_items);
+                else
+                    rv = _ ("No Genres");
+            break;
+
+            case BrowserColumn.Category.ARTIST:
+                if (n_items == 1)
+                    rv = _ ("All Artists");
+                else if (n_items > 1)
+                    rv = _ ("All %i Artists").printf (n_items);
+                else
+                    rv = _ ("No Artists");
+            break;
+
+            case BrowserColumn.Category.ALBUM:
+                if (n_items == 1)
+                    rv = _ ("All Albums");
+                else if (n_items > 1)
+                    rv = _ ("All %i Albums").printf (n_items);
+                else
+                    rv = _ ("No Albums");
+            break;
+
+            case BrowserColumn.Category.YEAR:
+                if (n_items == 1)
+                    rv = _ ("All Years");
+                else if (n_items > 1)
+                    rv = _ ("All %i Years").printf (n_items);
+                else
+                    rv = _ ("No Years");
+            break;
+
+            case BrowserColumn.Category.RATING:
+                if (n_items >= 1)
+                    rv = _ ("All Ratings");
+                else
+                    rv = _ ("No Ratings");
+            break;
+
+            case BrowserColumn.Category.GROUPING:
+                if (n_items == 1)
+                    rv = _ ("All Groupings");
+                else if (n_items > 1)
+                    rv = _ ("All %i Groupings").printf (n_items);
+                else
+                    rv = _ ("No Groupings");
+            break;
+
+            case BrowserColumn.Category.COMPOSER:
+                if (n_items == 1)
+                    rv = _ ("All Composers");
+                else if (n_items > 1)
+                    rv = _ ("All %i Composers").printf (n_items);
+                else
+                    rv = _ ("No Composers");
+            break;
+        }
+
+        return rv;
+    }
+
+
+    public new void set (TreeIter iter, ...) {
+        if (iter.stamp != this.stamp)
+            return;
+
+        var args = va_list (); // now call args.arg () to poll
+
+        while (true) {
+            int col = args.arg ();
+            if (col < 0 || col >= 1)
+                return;
+            else if (col == 0) {
+                string val = args.arg ();
+                Sequence<string>.set ( (SequenceIter<string>)iter.user_data, val);
+            }
+        }
+    }
+
+    public void remove (TreeIter iter) {
+        if (iter.stamp != this.stamp)
+            return;
+
+        var path = new TreePath.from_string ( ( (SequenceIter)iter.user_data).get_position ().to_string ());
+        Sequence<string>.remove ( (SequenceIter<string>)iter.user_data);
+        row_deleted (path);
+    }
+
+    /** Fills in sort_column_id and order with the current sort column and the order. **/
+    public bool get_sort_column_id (out int sort_column_id, out SortType order) {
+        sort_column_id = this.sort_column_id;
+        order = sort_direction;
+
+        return true;
+    }
+
+    /** Returns true if the model has a default sort function. **/
+    public bool has_default_sort_func () {
+        return (default_sort_func != null);
+    }
+
+    /** Sets the default comparison function used when sorting to be sort_func. **/
+    public void set_default_sort_func (owned TreeIterCompareFunc sort_func) {
+        default_sort_func = sort_func;
+    }
+
+    /** Sets the current sort column to be sort_column_id. **/
+    public void set_sort_column_id (int sort_column_id, SortType order) {
+        bool changed = (this.sort_column_id != sort_column_id || order != sort_direction);
+
+        this.sort_column_id = sort_column_id;
+        sort_direction = order;
+
+        if (changed && sort_column_id >= 0) {
+            /* do the sort for reals */
+            rows.sort_iter (sequenceIterCompareFunc);
+
+            sort_column_changed ();
+        }
+    }
+
+    public void set_sort_func (int sort_column_id, owned TreeIterCompareFunc sort_func) {
+
+    }
+
+
+    /** Custom function to use built in sort in Sequence to our advantage **/
+    public int sequenceIterCompareFunc (SequenceIter<string> a, SequenceIter<string> b) {
+        int rv = 1;
+
+        if (sort_column_id < 0)
+            return 0;
+
+        if (sort_column_id == 0) {
+            var first_sequence_iter = (SequenceIter)first_iter.user_data;
+
+            // "All" is always the first
+            if (a == first_sequence_iter) {
+                rv = -1;
+            }
+            else if (b == first_sequence_iter) {
+                rv = 1;
+            }
+            else {
+                if (category == BrowserColumn.Category.ARTIST || category == BrowserColumn.Category.ALBUM)
+                    rv = String.compare (Sequence<string>.get (a), Sequence<string>.get (b));
+                else
+                    rv = String.compare (Sequence<string>.get (a), Sequence<string>.get (b));
+            }
+        }
+
+        if (sort_direction == SortType.DESCENDING)
+            rv = (rv > 0) ? -1 : 1;
+
+        return rv;
+    }
 }