ocarina: Rename gui/ to ocarina/

I think ocarina/ is a better name for this directory, and now that I've
named the executable "ocarina.bin" I can do this again.  I also added
functions for creating a page footer with the basic controls.

Sconstruct

@@ -39,5 +39,5 @@ def list_dirs(directory):
 	dirs  = [x[0] for x in os.walk(directory)]
 	return [Glob(dir + "/*.cpp") for dir in dirs]
 
-ocarina=env.Program('ocarina.bin', list_dirs('libsaria') + list_dirs('gui'))
+ocarina=env.Program('ocarina.bin', list_dirs('libsaria') + list_dirs('ocarina'))
 Clean(ocarina, "include/version.h")

gui/ocarina.cpp

@@ -1,64 +0,0 @@
-
-#include <version.h>
-#include <ocarina/callback.h>
-#include <ocarina/gtk.h>
-#include <ocarina/button.h>
-#include <ocarina/window.h>
-#include <libsaria/libsaria.h>
-
-void ocarina_init(int argc, char **argv)
-{
-	GtkWidget *open;
-	GtkWidget *rewind;
-	GtkWidget *forward;
-	GtkWidget *play;
-	GtkWidget *pause;
-	GtkWidget *stop;
-	GtkWidget *volume;
-	GtkWidget *hbox;
-
-	window_init();
-	window_title("Ocarina " + vers_str());
-	window_icon("images/ocarina.png");
-
-	hbox    = gtk_hbox_new(FALSE, 0);
-	open    = make_open_button();
-	rewind  = make_rewind_button();
-	forward = make_forward_button();
-	play    = make_play_button();
-	pause   = make_pause_button();
-	stop    = make_stop_button();
-	volume  = make_volume_button();
-
-	box_pack_start(hbox, open,    FALSE, FALSE, 0);
-	box_pack_start(hbox, rewind,  FALSE, FALSE, 0);
-	box_pack_start(hbox, forward, FALSE, FALSE, 0);
-	box_pack_start(hbox, play,    FALSE, FALSE, 0);
-	box_pack_start(hbox, pause,   FALSE, FALSE, 0);
-	box_pack_start(hbox, stop,    FALSE, FALSE, 0);
-	box_pack_start(hbox, volume,  FALSE, FALSE, 0);
-	gtk_widget_show(hbox);
-	window_add(hbox);
-}
-
-void ocarina_quit()
-{
-	gtk_main_quit();
-}
-
-int main(int argc, char **argv)
-{
-	print("Ocarina 5.0");
-
-	libsaria_init(argc, argv);
-	setup_callbacks();
-	gtk_init(&argc, &argv);
-	ocarina_init(argc, argv);
-
-	if (argc > 1)
-		libsaria_get()->load(argv[1]);
-
-	gtk_main();
-	libsaria_quit();
-	return 0;
-}

include/ocarina/footer.h

@@ -0,0 +1,8 @@
+#ifndef OCARINA_FOOTER
+#define OCARINA_FOOTER
+
+#include <ocarina/gtk.h>
+
+GtkWidget *get_tiny_footer();
+
+#endif /* OCARINA_FOOTER */

ocarina/footer/tiny.cpp

@@ -0,0 +1,31 @@
+
+#include <ocarina/footer.h>
+#include <ocarina/button.h>
+
+static GtkWidget *footer = NULL;
+
+static void footer_pack(GtkWidget *widget)
+{
+	box_pack_start(footer, widget, FALSE, FALSE, 0);
+}
+
+static void make_tiny_footer()
+{
+	footer = gtk_hbox_new(FALSE, 0);
+	gtk_widget_show(footer);
+
+	footer_pack(make_open_button());
+	footer_pack(make_rewind_button());
+	footer_pack(make_forward_button());
+	footer_pack(make_play_button());
+	footer_pack(make_pause_button());
+	footer_pack(make_stop_button());
+	footer_pack(make_volume_button());
+}
+
+GtkWidget *get_tiny_footer()
+{
+	if (footer == NULL)
+		make_tiny_footer();
+	return footer;
+}

ocarina/ocarina.cpp

@@ -0,0 +1,37 @@
+
+#include <version.h>
+#include <ocarina/callback.h>
+#include <ocarina/gtk.h>
+#include <ocarina/footer.h>
+#include <ocarina/window.h>
+#include <libsaria/libsaria.h>
+
+void ocarina_init(int argc, char **argv)
+{
+	window_init();
+	window_title("Ocarina " + vers_str());
+	window_icon("images/ocarina.png");
+	window_add(get_tiny_footer());
+}
+
+void ocarina_quit()
+{
+	gtk_main_quit();
+}
+
+int main(int argc, char **argv)
+{
+	print("Ocarina 5.0");
+
+	libsaria_init(argc, argv);
+	setup_callbacks();
+	gtk_init(&argc, &argv);
+	ocarina_init(argc, argv);
+
+	if (argc > 1)
+		libsaria_get()->load(argv[1]);
+
+	gtk_main();
+	libsaria_quit();
+	return 0;
+}