libsaria: Introduce libsaria namespace

Now I don't need to define everything as libsaria_some_func(), instead
these functions will exist in the libsaria namespace.

include/libsaria/controls.h

@@ -1,9 +1,15 @@
+#ifndef LIBSARIA_CONTROLS_H
+#define LIBSARIA_CONTROLS_H
 
 #include <string>
 using namespace std;
 
-void libsaria_play();
-void libsaria_pause();
-void libsaria_stop();
+namespace libsaria
+{
+	void play();
+	void pause();
+	void stop();
+	void load(string);
+}
 
-void libsaria_load(string);
+#endif /* LIBSARIA_CONTROLS_H */

include/libsaria/idle.h

@@ -9,8 +9,11 @@ class IdleTask
 		virtual void run_task() = 0;
 };
 
-int libsaria_idle_task();
-int libsaria_queue_task(IdleTask *);
-int libsaria_queue_task_front(IdleTask *);
+namespace libsaria
+{
+	int idle_task();
+	int queue_task(IdleTask *);
+	int queue_task_front(IdleTask *);
+}
 
 #endif /* LIBSARIA_IDLE_H */

include/libsaria/library.h

@@ -7,11 +7,14 @@
 #include <string>
 using namespace std;
 
-void libsaria_add_library(string);
-void libsaria_refresh_library();
-void libsaria_library_list(list<Track> &);
-void libsaria_play_id(ino_t);
-void libsaria_library_save();
-void libsaria_library_load();
+namespace libsaria
+{
+	void add_library(string);
+	void refresh_library();
+	void library_list(list<Track> &);
+	void play_id(ino_t);
+	void library_save();
+	void library_load();
+}
 
 #endif /* LIBSARIA_LIBRARY_H */

include/libsaria/libsaria.h

@@ -1,7 +1,10 @@
 #ifndef LIBSARIA_H
 #define LIBSARIA_H
 
-void libsaria_init(int, char **);
-void libsaria_quit();
+namespace libsaria
+{
+	void init(int, char **);
+	void quit();
+}
 
 #endif /* LIBSARIA_H */

include/libsaria/progress.h

@@ -1,3 +1,10 @@
+#ifndef LIBSARIA_PROGRESS_H
+#define LIBSARIA_PROGRESS_H
 
-void libsaria_seek(int);
+namespace libsaria
+{
+	void seek(int);
+	void seek_to(double);
+}
 
+#endif /* LIBSARIA_PROGRESS_H */

include/libsaria/volume.h

@@ -1,3 +1,10 @@
+#ifndef LIBSARIA_VOLUME_H
+#define LIBSARIA_VOLUME_H
 
-void libsaria_set_volume(double);
-double libsaria_get_volume();
+namespace libsaria
+{
+	void set_volume(double);
+	double get_volume();
+}
+
+#endif /* LIBSARIA_VOLUME_H */

libsaria/audio.cpp

@@ -1,5 +1,8 @@
 
 #include <libsaria/libsaria.h>
+#include <libsaria/controls.h>
+#include <libsaria/progress.h>
+#include <libsaria/volume.h>
 #include <libsaria/callback.h>
 
 #include "audio/audio.h"
@@ -11,47 +14,47 @@ void audio_init(int argc, char **argv)
 	audio.init(argc, argv);
 }
 
-void libsaria_seek_to(double prcnt)
+void libsaria::seek_to(double prcnt)
 {
 	audio.seek_to(prcnt);
 }
 
-void libsaria_seek(int dt)
+void libsaria::seek(int dt)
 {
 	audio.seek(dt);
 }
 
-void libsaria_play()
+void libsaria::play()
 {
 	if(audio.play())
 		trigger_callback(PLAY);
 }
 
-void libsaria_pause()
+void libsaria::pause()
 {
 	if(audio.pause())
 		trigger_callback(PAUSE);
 }
 
-void libsaria_stop()
+void libsaria::stop()
 {
-	libsaria_pause();
-	libsaria_seek_to(0);
+	libsaria::pause();
+	libsaria::seek_to(0);
 }
 
-void libsaria_load(string filepath)
+void libsaria::load(string filepath)
 {
 	audio.load(filepath);
-	libsaria_play();
+	libsaria::play();
 }
 
-void libsaria_set_volume(double volume)
+void libsaria::set_volume(double volume)
 {
 	audio.set_volume(volume);
 	trigger_callback(VOLUME);
 }
 
-double libsaria_get_volume()
+double libsaria::get_volume()
 {
 	return audio.get_volume();
 }

libsaria/idle.cpp

@@ -4,7 +4,7 @@
 
 static Idle idle;
 
-int libsaria_idle_task()
+int libsaria::idle_task()
 {
 	return idle.run_task();
 }
@@ -18,7 +18,7 @@ int libsaria_idle_task()
  * goes from size is increased from 0 to 1.  This will tell
  * the UI that idle tasks have been queued.
  */
-static int libsaria_queue_task_generic(IdleTask *task, bool front)
+static int queue_task_generic(IdleTask *task, bool front)
 {
 	int queue_size = idle.queue_task(task, front);
 	if (queue_size == 1)
@@ -26,12 +26,12 @@ static int libsaria_queue_task_generic(IdleTask *task, bool front)
 	return queue_size;
 }
 
-int libsaria_queue_task(IdleTask *task)
+int libsaria::queue_task(IdleTask *task)
 {
-	return libsaria_queue_task_generic(task, false);
+	return queue_task_generic(task, false);
 }
 
-int libsaria_queue_task_front(IdleTask *task)
+int libsaria::queue_task_front(IdleTask *task)
 {
-	return libsaria_queue_task_generic(task, true);
+	return queue_task_generic(task, true);
 }

libsaria/library.cpp

@@ -1,5 +1,6 @@
 
 #include "library/library.h"
+#include <libsaria/library.h>
 #include <libsaria/callback.h>
 #include <libsaria/track.h>
 
@@ -8,33 +9,33 @@ using namespace std;
 
 static Library library;
 
-void libsaria_add_library(string dir)
+void libsaria::add_library(string dir)
 {
 	library.add_path(dir);
 	library.update_path(dir);
 }
 
-void libsaria_refresh_library()
+void libsaria::refresh_library()
 {
 	trigger_callback(LIBRARY_REFRESH);
 }
 
-void libsaria_library_list(list<Track> &track_list)
+void libsaria::library_list(list<Track> &track_list)
 {
 	library.list_all(track_list);
 }
 
-void libsaria_play_id(ino_t inode)
+void libsaria::play_id(ino_t inode)
 {
 	library.play_id(inode);
 }
 
-void libsaria_library_save()
+void libsaria::library_save()
 {
 	library.save();
 }
 
-void libsaria_library_load()
+void libsaria::library_load()
 {
 	library.load();
 }

libsaria/library/path.cpp

@@ -35,6 +35,6 @@ bool LibraryPath::play_id(ino_t inode)
 	iter = file_map.find(inode);
 	if (iter == file_map.end())
 		return false;
-	libsaria_load(iter->second.get_filepath());
+	libsaria::load(iter->second.get_filepath());
 	return true;
 }

libsaria/library/update.cpp

@@ -12,13 +12,13 @@
 static void queue_dir_scan(LibraryPath *lib_path, string scan_dir, bool end)
 {
 	ScanTask *task = new ScanTask(lib_path, scan_dir, end);
-	libsaria_queue_task(task);
+	libsaria::queue_task(task);
 }
 
 static void queue_lib_save()
 {
-	SaveTask *task = new SaveTask(libsaria_library_save);
-	libsaria_queue_task_front(task);
+	SaveTask *task = new SaveTask(libsaria::library_save);
+	libsaria::queue_task_front(task);
 }
 
 void Library::add_path(string dir)
@@ -85,7 +85,7 @@ void ScanTask::run_task()
 	if (end_dir == true) {
 		print("Library path size: ");
 		println(library->size());
-		libsaria_refresh_library();
+		libsaria::refresh_library();
 		queue_lib_save();
 	}
 }

libsaria/libsaria.cpp

@@ -5,17 +5,17 @@
 #include <libsaria/print.h>
 #include <libsaria/library.h>
 
-void libsaria_init(int argc, char **argv)
+void libsaria::init(int argc, char **argv)
 {
 	println("Initializing libsaria");
 	audio_init(argc, argv);
 	print("saria dir: ");
 	println(get_saria_dir());
 	make_saria_dir();
-	libsaria_library_load();
+	libsaria::library_load();
 }
 
-void libsaria_quit()
+void libsaria::quit()
 {
 	println("Quitting libsaria");
 }