ocarina: Create initial namespace

Namespaces make code easier to follow, and remove the need to mangle the
beginning of function names by using ocarina_*() or libsaria_*().  In
other words: "namespaces are one honking good idea.  Let's have more of
them!"
This commit is contained in:
Bryan Schumaker 2011-10-29 15:47:00 -04:00
parent 6b12cff613
commit 7c79aab787
4 changed files with 34 additions and 24 deletions

View File

@ -1,7 +1,12 @@
#ifndef OCARINA_H #ifndef OCARINA_H
#define OCARINA_H #define OCARINA_H
void ocarina_quit(); namespace ocarina
void ocarina_idle_add(); {
void quit();
void idle_add();
};
#endif #endif

View File

@ -25,7 +25,7 @@ void cb_pause()
void cb_idle_task_queued() void cb_idle_task_queued()
{ {
println("Ocarina IDLE_TASK_QUEUED callback!"); println("Ocarina IDLE_TASK_QUEUED callback!");
ocarina_idle_add(); ocarina::idle_add();
} }
void cb_library_refresh() void cb_library_refresh()

View File

@ -12,19 +12,22 @@
#include <libsaria/print.h> #include <libsaria/print.h>
#include <libsaria/idle.h> #include <libsaria/idle.h>
static gboolean ocarina_idle(gpointer data) namespace ocarina
{
static gboolean idle(gpointer data)
{ {
if (libsaria::idle::run_task() == 0) if (libsaria::idle::run_task() == 0)
return FALSE; /* There are no idle events left */ return FALSE; /* There are no idle events left */
return TRUE; /* Process remaining idle events */ return TRUE; /* Process remaining idle events */
} }
void ocarina_idle_add() void idle_add()
{ {
g_idle_add(ocarina_idle, NULL); g_idle_add(idle, NULL);
} }
void ocarina_init(int argc, char **argv) void init(int argc, char **argv)
{ {
window_init("Ocarina " + vers_str(), "images/ocarina.png"); window_init("Ocarina " + vers_str(), "images/ocarina.png");
window_add(get_tabs()); window_add(get_tabs());
@ -32,11 +35,13 @@ void ocarina_init(int argc, char **argv)
settings_init(); settings_init();
} }
void ocarina_quit() void quit()
{ {
gtk_main_quit(); gtk_main_quit();
} }
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
println("Ocarina " + vers_str()); println("Ocarina " + vers_str());
@ -44,7 +49,7 @@ int main(int argc, char **argv)
libsaria::init(argc, argv); libsaria::init(argc, argv);
setup_callbacks(); setup_callbacks();
gtk_init(&argc, &argv); gtk_init(&argc, &argv);
ocarina_init(argc, argv); ocarina::init(argc, argv);
if (argc > 1) if (argc > 1)
libsaria::audio::load(argv[1]); libsaria::audio::load(argv[1]);

View File

@ -10,7 +10,7 @@ static GtkWidget *window;
void destroy_window(GtkWidget *widget, GdkEvent *event, gpointer data) void destroy_window(GtkWidget *widget, GdkEvent *event, gpointer data)
{ {
ocarina_quit(); ocarina::quit();
} }
void window_resize(int w, int h) void window_resize(int w, int h)