libsaria: Remove most of the playlist class

I'm going to clean it up too, so I've removed everything for now to
slowly re-add later.

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

include/libsaria/playlist.h

@@ -11,13 +11,9 @@ using namespace std;
 enum PlaylistFlags {
 	PL_NONE 	= (0),
 	PL_DRAIN	= (1 << 0),
-	PL_RANDOM	= (1 << 1),
-	PL_SEQUENTIAL	= (1 << 2),
-	PL_FILTER	= (1 << 3),
+	PL_STATIC	= (1 << 1),
 };
 
-static const unsigned int PL_QUEUE = PL_DRAIN | PL_SEQUENTIAL;
-
 namespace libsaria
 {
 
@@ -26,7 +22,7 @@ namespace libsaria
 
 	class Playlist {
 		private:
-			bool del_renderer;
+			/*bool del_renderer;
 			unsigned int flags;
 			string filename;
 			list<Track *> plist;
@@ -38,14 +34,14 @@ namespace libsaria
 			void incr_iter(list<Track *>::iterator &);
 			bool pick_next(list<Track *>::iterator &);
 			void sequential_next();
-			void random_next();
+			void random_next();*/
 
 		public:
 			Playlist(unsigned int);
-			Playlist(string, unsigned int);
+			//Playlist(string, unsigned int);
 			~Playlist();
 
-			void set_renderer(PlaylistRenderer *, bool);
+			/*void set_renderer(PlaylistRenderer *, bool);
 			void delete_renderer();
 
 			void do_load();
@@ -64,7 +60,7 @@ namespace libsaria
 			unsigned int apparent_size();
 			Track *next();
 
-			void for_each_insert();
+			void for_each_insert();*/
 	};
 
 }; /* Namespace: libsaria */

libsaria/playlist/file.cpp

@@ -5,7 +5,7 @@
 
 #include <stdio.h>
 
-static void load_playlist(void *plist)
+/*static void load_playlist(void *plist)
 {
 	libsaria::Playlist *playlist = (libsaria::Playlist *)plist;
 	playlist->do_load();
@@ -16,11 +16,11 @@ static void save_playlist(void *plist)
 	libsaria::Playlist *playlist = (libsaria::Playlist *)plist;
 	playlist->do_save();
 }
-
+*/
 namespace libsaria
 {
 
-	void Playlist::do_load()
+	/*void Playlist::do_load()
 	{
 		unsigned int size;
 		//sid_t songid;
@@ -28,13 +28,13 @@ namespace libsaria
 
 		if (!in.good())
 			return;
-		in >> size;
+		in >> size;*/
 
 		/*for (unsigned int i = 0; i < size; i++) {
 			in >> songid;
 			//plist.push_back(library::lookup(songid));
 		}*/
-	}
+	/*}
 
 	void Playlist::load()
 	{
@@ -52,10 +52,10 @@ namespace libsaria
 		OutFile out(filename);
 		list<Track *>::iterator it;
 
-		out << plist.size() << "\n";
+		out << plist.size() << "\n";*/
 		/*for (it = plist.begin(); it != plist.end(); it++)
 			out << (*it)->get_songid() << "\n";*/
-	}
+/*	}
 
 	void Playlist::save()
 	{
@@ -71,6 +71,6 @@ namespace libsaria
 
 		task = new IOTask(save_playlist, this);
 		task->queue();
-	}
+	}*/
 
 }; /* Namespace: libsaria */

libsaria/playlist/next.cpp

@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 
-static unsigned int CHECK_RAND_PREF = PL_RANDOM | PL_SEQUENTIAL;
+/*static unsigned int CHECK_RAND_PREF = PL_RANDOM | PL_SEQUENTIAL;
 
 static inline bool choose_randomly(unsigned int flags)
 {
@@ -64,13 +64,13 @@ namespace libsaria
 
 		for (unsigned int i = 0; i < n; i++) {
 			incr_iter(cur);
-			if (flags & PL_FILTER) {
+			if (flags & PL_FILTER) {*/
 				/*sid_t songid = (*cur)->get_songid();
 				while (!index::is_visible(songid)) {
 					incr_iter(cur);
 					songid = (*cur)->get_songid();
 				}*/
-			}
+		/*	}
 		}
 	}
 
@@ -101,4 +101,4 @@ namespace libsaria
 		return track;
 	}
 
-}; /* Namespace: libsaria */
+};*/ /* Namespace: libsaria */

libsaria/playlist/playlist.cpp

@@ -5,11 +5,11 @@
 #include <libsaria/playlist.h>
 #include <libsaria/renderer.h>
 
-static bool compare_tracks(libsaria::Track *one, libsaria::Track *two)
-{
+/*static bool compare_tracks(libsaria::Track *one, libsaria::Track *two)
+{*/
 	/* I want to compare tracks and not pointers */
 	//return *one < *two;
-	return true;
+/*	return true;
 }
 
 static void advance_iterator(list<libsaria::Track *>::iterator &it, int n)
@@ -22,12 +22,12 @@ static void remove_iterator(list<libsaria::Track *> &lst, list<libsaria::Track *
 {
 	it = lst.erase(it);
 	it--;
-}
+}*/
 
 namespace libsaria
 {
 
-	void Playlist::init_common(string file, unsigned int options)
+	/*void Playlist::init_common(string file, unsigned int options)
 	{
 		filename = file;
 		flags = options;
@@ -67,7 +67,7 @@ namespace libsaria
 		init_common(filename, flags);
 	}
 
-	/*void Playlist::add_ids(list<sid_t> &ids)
+	void Playlist::add_ids(list<sid_t> &ids)
 	{
 		Track *track;
 		list<sid_t>::iterator it;
@@ -79,7 +79,7 @@ namespace libsaria
 				renderer->insert(track, plist.size() - 1);
 		}
 		save();
-	}*/
+	}
 
 	void Playlist::add_track(libsaria::Track *track)
 	{
@@ -125,8 +125,8 @@ namespace libsaria
 
 	unsigned int Playlist::apparent_size()
 	{
-		/*if ( (flags & PL_FILTER) && (index::is_filtered()) )
-			return index::size();*/
+		if ( (flags & PL_FILTER) && (index::is_filtered()) )
+			return index::size();
 		return plist.size();
 	}
 
@@ -143,5 +143,5 @@ namespace libsaria
 			renderer->insert(*it, i);
 			i++;
 		}
-	}
+	}*/
 }

libsaria/playlist/renderer.cpp

@@ -15,8 +15,8 @@ namespace libsaria
 
 	void PlaylistRenderer::set_playlist(Playlist *plist, bool del_render)
 	{
-		playlist = plist;
-		playlist->set_renderer(this, del_render);
+		/*playlist = plist;
+		playlist->set_renderer(this, del_render);*/
 	}
 
 	Playlist *PlaylistRenderer::get_playlist()
@@ -28,7 +28,7 @@ namespace libsaria
 	{
 		if (playlist == NULL)
 			return;
-		playlist->for_each_insert();
+		//playlist->for_each_insert();
 	}
 
 	void PlaylistRenderer::playlist_empty()

libsaria/playlist/stack.cpp

@@ -23,9 +23,10 @@ namespace libsaria
 
 	Playlist *new_playlist(string file, unsigned int flags)
 	{
-		Playlist *plist = new Playlist(file, flags);
+		/*Playlist *plist = new Playlist(file, flags);
 		stack_playlist(plist);
-		return plist;
+		return plist;*/
+		return NULL;
 	}
 
 	/*void add_to_playlist(list<sid_t> &ids)
@@ -49,12 +50,12 @@ namespace libsaria
 
 	void stack_top_pop()
 	{
-		Playlist *plist = playlist_stack.front();
-		if (plist->size() == 0) {
+		//Playlist *plist = playlist_stack.front();
+		/*if (plist->size() == 0) {
 			plist->delete_renderer();
 			delete plist;
 			playlist_stack.pop_front();
-		}
+		}*/
 	}
 
 	/*string next_file()

ocarina/songlist/songlist.cpp

@@ -72,7 +72,7 @@ void SongList::rm_selected_indices()
 	list<int>::iterator it;
 
 	list_selected_indices(selected);
-	get_playlist()->rm_indices(selected);
+	//get_playlist()->rm_indices(selected);
 }
 
 void SongList::index_removed(int index)
@@ -89,7 +89,7 @@ void SongList::set_label_text()
 	stringstream stream;
 
 	stream << name << " (";
-	stream << get_playlist()->apparent_size() << ")";
+	//stream << get_playlist()->apparent_size() << ")";
 	res = stream.str();
 
 	gtk_label_set_text(GTK_LABEL(label), res.c_str());