From 0b1684620d8f444382d277c95e6d9a14c8f359d0 Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@netapp.com>
Date: Sat, 29 Oct 2011 15:52:03 -0400
Subject: [PATCH] ocarina: Add the chooser to the ocarina namespace

This removes some ocarina_*() functions
---
 include/ocarina/chooser.h    |  9 +++++--
 ocarina/buttons/button.cpp   |  2 +-
 ocarina/chooser.cpp          | 52 +++++++++++++++++++-----------------
 ocarina/settings/library.cpp |  2 +-
 4 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/include/ocarina/chooser.h b/include/ocarina/chooser.h
index 1fa027a4..68d9d624 100644
--- a/include/ocarina/chooser.h
+++ b/include/ocarina/chooser.h
@@ -4,7 +4,12 @@
 #include <string>
 using namespace std;
 
-string ocarina_choose_file();
-string ocarina_choose_dir();
+namespace ocarina
+{
+
+	string choose_file();
+	string choose_dir();
+
+};
 
 #endif
diff --git a/ocarina/buttons/button.cpp b/ocarina/buttons/button.cpp
index dec326ff..7518368f 100644
--- a/ocarina/buttons/button.cpp
+++ b/ocarina/buttons/button.cpp
@@ -59,7 +59,7 @@ GtkWidget *make_text_button(const gchar *stockid,
 
 static void on_click_open_file(GtkWidget *b, GdkEvent *e, gpointer d)
 {
-	string file = ocarina_choose_file();
+	string file = ocarina::choose_file();
 	if (file != "") {
 		println("Playing file: " + file);
 		libsaria::audio::load(file);
diff --git a/ocarina/chooser.cpp b/ocarina/chooser.cpp
index 575184e9..bf4d3563 100644
--- a/ocarina/chooser.cpp
+++ b/ocarina/chooser.cpp
@@ -2,32 +2,36 @@
 #include <ocarina/gtk.h>
 #include <ocarina/chooser.h>
 
-static string ocarina_generic_chooser(GtkFileChooserAction action)
+namespace ocarina
 {
-	GtkWidget *chooser = gtk_file_chooser_dialog_new(
-				"Open File", NULL, action,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-				NULL);
-	char *c_file;
-	string filename = "";
 
-	if ( gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_ACCEPT) {
-		c_file = gtk_file_chooser_get_filename(
-						GTK_FILE_CHOOSER(chooser));
-		filename = c_file;
-		g_free(c_file);
+	static string generic_chooser(GtkFileChooserAction action)
+	{
+		GtkWidget *chooser = gtk_file_chooser_dialog_new(
+					"Open File", NULL, action,
+					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+					GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+					NULL);
+		char *c_file;
+		string filename = "";
+
+		if ( gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_ACCEPT) {
+			c_file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser));
+			filename = c_file;
+			g_free(c_file);
+		}
+		gtk_widget_destroy(chooser);
+		return filename;
 	}
-	gtk_widget_destroy(chooser);
-	return filename;
-}
 
-string ocarina_choose_file()
-{
-	return ocarina_generic_chooser(GTK_FILE_CHOOSER_ACTION_OPEN);
-}
+	string choose_file()
+	{
+		return generic_chooser(GTK_FILE_CHOOSER_ACTION_OPEN);
+	}
 
-string ocarina_choose_dir()
-{
-	return ocarina_generic_chooser(GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-}
+	string choose_dir()
+	{
+		return generic_chooser(GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+	}
+
+};
diff --git a/ocarina/settings/library.cpp b/ocarina/settings/library.cpp
index 96a1cdcc..917b8924 100644
--- a/ocarina/settings/library.cpp
+++ b/ocarina/settings/library.cpp
@@ -26,7 +26,7 @@ static list<PathInfo> path_widgets;
 
 static void on_click_add(GtkWidget *b, GdkEvent *e, gpointer d)
 {
-	string dir = ocarina_choose_dir();
+	string dir = ocarina::choose_dir();
 	if (dir != "" ) {
 		println("Scanning dir: " + dir);
 		libsaria::library::add_path(dir);