libsaria: Remove library and queue iterator functions

I don't need these now that I have playlist renderers, so I might as
well rip out the code while I'm thinking about it.

Signed-off-by: Bryan Schumaker <bjschuma@gmail.com>

include/libsaria/playlist.h

@@ -27,7 +27,6 @@ namespace libsaria
 			unsigned int flags;
 			string filename;
 			list<Track *> plist;
-			list<Track *>::iterator it;
 			list<Track *>::iterator cur;
 			PlaylistRenderer *renderer;
 
@@ -61,11 +60,7 @@ namespace libsaria
 			unsigned int apparent_size();
 			Track *next();
 
-			/* Iterator functions */
 			void for_each_insert();
-			void iter_reset();
-			Track *iter_next();
-			bool iter_end();
 	};
 
 }; /* Namespace: libsaria */

include/ocarina/songlist.h

@@ -27,9 +27,6 @@ class MenuItem
 struct SongListFuncs
 {
 	unsigned int (*size)();
-	void (*iter_reset)();
-	libsaria::Track *(*iter_next)();
-	bool (*iter_end)();
 };
 
 class SongList : public libsaria::PlaylistRenderer

libsaria/library/list.cpp

@@ -33,21 +33,6 @@ namespace libsaria
 		return lib_playlist.apparent_size();
 	}
 
-	void library::iter::reset()
-	{
-		lib_playlist.iter_reset();
-	}
-
-	libsaria::Track *library::iter::next()
-	{
-		return lib_playlist.iter_next();
-	}
-
-	bool library::iter::end()
-	{
-		return lib_playlist.iter_end();
-	}
-
 	string library::next_file()
 	{
 		libsaria::Track *cur = lib_playlist.next();

libsaria/playlist/iter.cpp

@@ -1,25 +0,0 @@
-// Copyright (c) 2012 Bryan Schumaker.
-
-#include <libsaria/playlist.h>
-
-namespace libsaria
-{
-
-	void Playlist::iter_reset()
-	{
-		it = plist.begin();
-	}
-
-	Track *Playlist::iter_next()
-	{
-		Track *track = *it;
-		it++;
-		return track;
-	}
-
-	bool Playlist::iter_end()
-	{
-		return it == plist.end();
-	}
-
-}; /* Namespace: libsaria */

libsaria/playlist/playlist.cpp

@@ -19,7 +19,6 @@ namespace libsaria
 		filename = file;
 		flags = options;
 		cur = plist.end();
-		it = plist.end();
 		load();
 	}
 

libsaria/queue/queue.cpp

@@ -49,21 +49,6 @@ namespace libsaria
 		task->queue();
 	}
 
-	void queue::iter::reset()
-	{
-		q_queue.iter_reset();
-	}
-
-	libsaria::Track *queue::iter::next()
-	{
-		return q_queue.iter_next();
-	}
-
-	bool queue::iter::end()
-	{
-		return q_queue.iter_end();
-	}
-
 	Playlist *queue::get_playlist()
 	{
 		return &q_queue;

ocarina/library.cpp

@@ -51,9 +51,6 @@ namespace ocarina
 	{
 		library_menu.push_back(MenuItem("Add to Queue", add_to_queue_event));
 		library_funcs.size = libsaria::library::size;
-		library_funcs.iter_reset = libsaria::library::iter::reset;
-		library_funcs.iter_next = libsaria::library::iter::next;
-		library_funcs.iter_end = libsaria::library::iter::end;
 
 		register_shortcut("q", add_to_queue);
 

ocarina/queue.cpp

@@ -44,9 +44,6 @@ namespace ocarina
 	{
 		queue_menu.push_back(MenuItem("Remove from Queue", rm_from_queue_event));
 		queue_funcs.size = libsaria::queue::size;
-		queue_funcs.iter_reset = libsaria::queue::iter::reset;
-		queue_funcs.iter_next = libsaria::queue::iter::next;
-		queue_funcs.iter_end = libsaria::queue::iter::end;
 
 		register_shortcut("Delete", rm_from_queue);