From 5b2e0c7b826815be4419de7373d879dc3e19e57a Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@gmail.com>
Date: Sun, 6 Nov 2011 12:44:14 -0500
Subject: [PATCH] libsaria: Fill a SourceModel from the play_list

Looping over a single list is really easy and straightforward!
---
 libsaria/library/library.cpp |  7 -------
 libsaria/library/library.h   |  1 -
 libsaria/library/list.cpp    |  9 +++++++++
 libsaria/library/path.cpp    | 10 ----------
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/libsaria/library/library.cpp b/libsaria/library/library.cpp
index 3cb46561..5ab07339 100644
--- a/libsaria/library/library.cpp
+++ b/libsaria/library/library.cpp
@@ -27,13 +27,6 @@ namespace libsaria
 		return NULL;
 	}
 
-	void library::for_each(SourceModel *model)
-	{
-		list<LibraryPath>::iterator it;
-		for (it = path_list.begin(); it != path_list.end(); it++)
-			it->for_each(model);
-	}
-
 	void library::for_each_path(void (*info_func)(struct library::PathInfo &))
 	{
 		list<LibraryPath>::iterator it;
diff --git a/libsaria/library/library.h b/libsaria/library/library.h
index d75bfde8..27db9906 100644
--- a/libsaria/library/library.h
+++ b/libsaria/library/library.h
@@ -23,7 +23,6 @@ class LibraryPath
 		~LibraryPath();
 
 		list<TrackTag> *get_list();
-		void for_each(libsaria::SourceModel *);
 		string get_path();
 		void get_info(void (*)(struct libsaria::library::PathInfo &));
 		bool get_info_id(ino_t &, void (*)(Track &));
diff --git a/libsaria/library/list.cpp b/libsaria/library/list.cpp
index 1dee7bd6..b135fcdf 100644
--- a/libsaria/library/list.cpp
+++ b/libsaria/library/list.cpp
@@ -24,6 +24,15 @@ namespace libsaria
 		println("Rebuilding play list");
 	}
 
+	void library::for_each(SourceModel *model)
+	{
+		list<TrackTag>::iterator it;
+		for (it = play_list.begin(); it != play_list.end(); it++) {
+			Track track = Track(&(*it));
+			model->insert(track);
+		}
+	}
+
 	unsigned int library::size()
 	{
 		return play_list.size();
diff --git a/libsaria/library/path.cpp b/libsaria/library/path.cpp
index cacec2eb..77969d64 100644
--- a/libsaria/library/path.cpp
+++ b/libsaria/library/path.cpp
@@ -6,16 +6,6 @@ using namespace std;
 #include <libsaria/library.h>
 #include "library.h"
 
-void LibraryPath::for_each(libsaria::SourceModel *model)
-{
-	list<TrackTag>::iterator it;
-
-	for (it = file_list.begin(); it != file_list.end(); it++) {
-		Track track = Track(&(*it));
-		model->insert(track);
-	}
-}
-
 string LibraryPath::get_path()
 {
 	return path;