libsaria: Comment out most of the library

I want to gradually re-add everything and clean it up as I go along.  To
help with this, I comment out the old code so I can use it as a
reference while writing new code.

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

include/libsaria/libpath.h

@@ -25,7 +25,7 @@ namespace libsaria
 			string get_path();
 			unsigned int get_size();
 			void prepare_for_removal();
-			void get_info(void (*)(struct libsaria::library::PathInfo &));
+			//void get_info(void (*)(struct libsaria::library::PathInfo &));
 			bool add_track(string &, sid_t &);
 			void validate_track(libsaria::Track *);
 			void save(OutFile &);

include/libsaria/library.h

@@ -16,14 +16,14 @@ namespace libsaria
 	namespace library
 	{
 
-		namespace iter
+		/*namespace iter
 		{
 			void reset();
 			libsaria::Track *next();
 			bool end();
-		} /* Namespace: iter */
+		}*/ /* Namespace: iter */
 
-		namespace pathiter
+		/*namespace pathiter
 		{
 			void reset();
 			libsaria::LibraryPath *next();
@@ -55,7 +55,7 @@ namespace libsaria
 		void filter(string &text);
 		bool is_visible(sid_t &);
 
-		Playlist *get_playlist();
+		Playlist *get_playlist();*/
 	}
 }
 

libsaria/controls.cpp

@@ -33,10 +33,10 @@ namespace libsaria
 	void play_id(sid_t &songid)
 	{
 		println("Playing id: %lu", songid);
-		Track *track = library::lookup(songid);
+		/*Track *track = library::lookup(songid);
 		string filepath = track->get_filepath();
 		println(filepath);
-		play_file(filepath);
+		play_file(filepath);*/
 	}
 
 	void set_pause_after(bool state)

libsaria/current.cpp

@@ -12,16 +12,16 @@ namespace libsaria
 	libsaria::Track *current_track()
 	{
 		sid_t songid;
-		libsaria::Track *current;
+		//libsaria::Track *current;
 		string file = libsaria::audio::get_current_file();
 
 		if (file == "")
 			return NULL;
 
 		songid  = lookup_songid(file);
-		current = libsaria::library::lookup(songid);
+		/*current = libsaria::library::lookup(songid);
 		if (current)
-			return current;
+			return current;*/
 
 		tmp_track = libsaria::Track(file, songid);
 		tmp_track.do_cleanup();

libsaria/library/file.cpp

@@ -8,7 +8,7 @@
 #include <libsaria/libpath.h>
 #include "library.h"
 
-static void do_load()
+/*static void do_load()
 {
 	unsigned int size;
 	InFile in("library.lib");
@@ -24,12 +24,12 @@ static void do_load()
 
 	libsaria::library::sort_list();
 	libsaria::library::refresh();
-}
+}*/
 
 namespace libsaria
 {
 
-	void library::load()
+	/*void library::load()
 	{
 		IOTask *task = new IOTask(do_load);
 		task->queue_front();
@@ -43,6 +43,6 @@ namespace libsaria
 		out << path_list.size() << "\n";
 		for (it = path_list.begin(); it != path_list.end(); it++)
 			it->save(out);
-	}
+	}*/
 
 }; /* namespace: libsaria */

libsaria/library/iter.cpp

@@ -9,7 +9,7 @@ namespace libsaria
 	namespace library
 	{
 
-		void pathiter::reset()
+		/*void pathiter::reset()
 		{
 			it = path_list.begin();
 		}
@@ -24,7 +24,7 @@ namespace libsaria
 		bool pathiter::end()
 		{
 			return it == path_list.end();
-		}
+		}*/
 
 	} /* Namespace: library */
 }; /* Namespace: libsaria */

libsaria/library/library.cpp

@@ -10,7 +10,7 @@ using namespace std;
 #include <libsaria/stack.h>
 #include "library.h"
 
-list<libsaria::LibraryPath> path_list;
+/*list<libsaria::LibraryPath> path_list;
 libsaria::Playlist lib_playlist(PL_RANDOM | PL_SEQUENTIAL | PL_FILTER);
 static map<sid_t, libsaria::Track *> lookup_map;
 
@@ -105,4 +105,4 @@ namespace libsaria
 		return &lib_playlist;
 	}
 
-}; /* namespace: libsaria */
+};*/ /* namespace: libsaria */

libsaria/library/list.cpp

@@ -11,7 +11,7 @@ using namespace std;
 namespace libsaria
 {
 
-	void library::list_track(libsaria::Track *track)
+/*	void library::list_track(libsaria::Track *track)
 	{
 		lib_playlist.add_track(track);
 		library_map_track(track);
@@ -27,5 +27,5 @@ namespace libsaria
 	{
 		lib_playlist.sort();
 	}
-
+*/
 }

libsaria/library/path/path.cpp

@@ -40,13 +40,13 @@ namespace libsaria
 		return file_list.size();
 	}
 
-	void LibraryPath::get_info(void (*info_func)(struct libsaria::library::PathInfo &))
+	/*void LibraryPath::get_info(void (*info_func)(struct libsaria::library::PathInfo &))
 	{
 		struct libsaria::library::PathInfo info;
 		info.path = path;
 		info.size = file_list.size();
 		info_func(info);
-	}
+	}*/
 
 	bool LibraryPath::has_id(sid_t id)
 	{

libsaria/library/path/update.cpp

@@ -53,7 +53,7 @@ static ScanTask *scandir(string dir, libsaria::LibraryPath *lib_path, ScanTask *
 void ScanTask::run_task()
 {
 	list<pair<string, sid_t> >::iterator it;
-	IOTask *save;
+	//IOTask *save;
 	bool dirty = false;
 
 	for (it = files.begin(); it != files.end(); it++) {
@@ -67,13 +67,13 @@ void ScanTask::run_task()
 
 	if (dirty) {
 		/* Save the library */
-		save = new IOTask(libsaria::library::save);
-		save->queue_front();
+		/*save = new IOTask(libsaria::library::save);
+		save->queue_front();*/
 
 		/* Bookkeeping for the UI */
-		libsaria::library::sort_list();
+		/*libsaria::library::sort_list();
 		libsaria::index::refresh();
-		libsaria::library::refresh();
+		libsaria::library::refresh();*/
 	}
 }
 

libsaria/libsaria.cpp

@@ -2,6 +2,7 @@
 #include <stdlib.h>
 
 #include <libsaria/libsaria.h>
+#include <libsaria/library.h>
 #include <libsaria/prefs.h>
 #include <libsaria/idle.h>
 #include <libsaria/fs.h>
@@ -32,10 +33,10 @@ namespace libsaria
 		/*audio::init(argc, argv);
 
 		println("saria dir: %s", get_saria_dir().c_str());
-		make_saria_dir();
+		make_saria_dir();*/
 
-		libsaria::library::init();
-		libsaria::stack_init();*/
+		//libsaria::library::init();
+		/*libsaria::stack_init();*/
 	}
 
 	void quit()

libsaria/playlist/file.cpp

@@ -32,7 +32,7 @@ namespace libsaria
 
 		for (unsigned int i = 0; i < size; i++) {
 			in >> songid;
-			plist.push_back(library::lookup(songid));
+			//plist.push_back(library::lookup(songid));
 		}
 	}
 

libsaria/playlist/playlist.cpp

@@ -72,7 +72,7 @@ namespace libsaria
 		list<sid_t>::iterator it;
 
 		for (it = ids.begin(); it != ids.end(); it++) {
-			track = library::lookup(*it);
+			//track = library::lookup(*it);
 			plist.push_back(track);
 			if (renderer)
 				renderer->insert(track, plist.size() - 1);

libsaria/track/track.cpp

@@ -71,7 +71,7 @@ namespace libsaria
 
 	void Track::do_cleanup()
 	{
-		libsaria::library::unlist_track(this);
+		//libsaria::library::unlist_track(this);
 	}
 
 	void Track::do_bookkeeping()
@@ -79,7 +79,7 @@ namespace libsaria
 		artist_lc = lowercase(artist);
 		album_lc = lowercase(album);
 		libsaria::index::add_track(this);
-		libsaria::library::list_track(this);
+		//libsaria::library::list_track(this);
 	}
 
 	void Track::save(OutFile &out)

ocarina/library.cpp

@@ -53,7 +53,7 @@ namespace ocarina
 
 		register_shortcut("q", add_to_queue);
 
-		library_list.set_playlist(libsaria::library::get_playlist(), false);
+		//library_list.set_playlist(libsaria::library::get_playlist(), false);
 		library_page = library_list.init("Library", &library_menu, true);
 		set_current_page(library_page);
 		ocarina::library::refresh();

ocarina/settings/library.cpp

@@ -21,16 +21,16 @@ static void on_click_add(GtkWidget *b, GdkEvent *e, gpointer d)
 	string dir = ocarina::choose_dir();
 	if (dir != "" ) {
 		println("Scanning dir: " + dir);
-		libsaria::library::add_path(dir);
+		//libsaria::library::add_path(dir);
 	}
 }
 
 static void on_click_update(GtkWidget *b, GdkEvent *e, gpointer d)
 {
-	libsaria::library::update();
+	//libsaria::library::update();
 }
 
-static void on_click_update_path(GtkWidget *b, GdkEvent *e, gpointer d)
+/*static void on_click_update_path(GtkWidget *b, GdkEvent *e, gpointer d)
 {
 	libsaria::library::update_path(widget_mapping[b]);
 }
@@ -97,7 +97,7 @@ static void add_library_path(libsaria::LibraryPath *path)
 
 	box_pack_start(panel, sep, TRUE, TRUE, 0);
 	box_pack_start(library_settings, panel, FALSE, FALSE, 0);
-}
+}*/
 
 static GtkWidget *get_button_row()
 {
@@ -124,16 +124,16 @@ void library_refresh_remove(GtkWidget *widget, gpointer data)
 
 void library_settings_refresh()
 {
-	libsaria::LibraryPath *path;
+	//libsaria::LibraryPath *path;
 
 	gtk_container_foreach(GTK_CONTAINER(library_settings), library_refresh_remove, NULL);
 	widget_mapping.clear();
 
-	libsaria::library::pathiter::reset();
+	/*libsaria::library::pathiter::reset();
 	while (!libsaria::library::pathiter::end()) {
 		path = libsaria::library::pathiter::next();
 		add_library_path(path);
-	}
+	}*/
 
 	box_pack_start(library_settings, get_button_row(), FALSE, FALSE, 0);
 	gtk_widget_show_all(library_settings);