libsaria: Replace the old print() function

I now use a wrapper around printf() that can be disabled when debugging
is off.

include/libsaria/print.h

@@ -4,10 +4,12 @@
 #include <string>
 using namespace std;
 
-void print(string item);
-void print(int item);
-
-void println(string item);
-void println(int item);
+#ifdef DEBUG
+void print(string, ...);
+void println(string, ...);
+#else /* DEBUG */
+static inline void print(string fmt, ...) {}
+static inline void println(string fmt, ...) {}
+#endif /* DEBUG */
 
 #endif /* LIBSARIA_PRINT */

libsaria/library/file.cpp

@@ -12,8 +12,7 @@ LibraryPath::LibraryPath(InFile &in, string dir)
 	path = dir;
 	size = in.read_lui();
 	println("Library path dir: " + path);
-	print("Library path size: ");
-	println(size);
+	println("Library path size: %d", size);
 
 	for (unsigned int i = 0; i < size; i++)
 		file_list.push_back(TrackTag(in));

libsaria/library/update.cpp

@@ -65,8 +65,7 @@ void ScanTask::run_task()
 	}
 
 	if (end_dir == true) {
-		print("Library path size: ");
-		println(library->size());
+		println("Library path size: %d", library->size());
 		save = new SaveTask(libsaria::library::save);
 		save->queue_front();
 		libsaria::library::refresh();

libsaria/libsaria.cpp

@@ -16,8 +16,7 @@ namespace libsaria
 		srand( time(NULL) );
 		println("Initializing libsaria");
 		audio::init(argc, argv);
-		print("saria dir: ");
-		println(get_saria_dir());
+		println("saria dir: %s", get_saria_dir().c_str());
 		make_saria_dir();
 		libsaria::library::load();
 		libsaria::prefs::load();

libsaria/print.cpp

@@ -1,33 +1,28 @@
 
-#include <iostream>
-using namespace std;
+#ifdef DEBUG
+
+#include <cstdio>
+#include <cstdarg>
 
 #include <libsaria/print.h>
 
-#ifdef DEBUG
-void print(string item)
+void print(string fmt, ...)
 {
-	cout << item;
+	va_list ap;
+
+	va_start(ap, fmt);
+	vprintf(fmt.c_str(), ap);
+	va_end(ap);
 }
 
-void println(string item)
+void println(string fmt, ...)
 {
-	cout << item << endl;
+	va_list ap;
+
+	fmt += "\n";
+	va_start(ap, fmt);
+	vprintf(fmt.c_str(), ap);
+	va_end(ap);
 }
 
-void print(int item)
-{
-	cout << item;
-}
-
-void println(int item)
-{
-	cout << item << endl;
-}
-#else /* DEBUG */
-void print(string item) {}
-void print(int item) {}
-
-void println(string item) {}
-void println(int item){}
 #endif /* DEBUG */

libsaria/queue/queue.cpp

@@ -15,8 +15,7 @@ namespace libsaria
 	void queue::add_ids(list<ino_t> &ids)
 	{
 		playqueue.insert(playqueue.end(), ids.begin(), ids.end());
-		print("Queue size: ");
-		println(playqueue.size());
+		println("Queue size: %d", playqueue.size());
 		trigger_callback(QUEUE_REFRESH);
 	}