From 5b3f8b13e07cd1144169c60770ff6aff7ac11c31 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Sat, 14 Jun 2014 20:05:24 -0400
Subject: [PATCH] lib: Initialize core libraries from a new middle layer

My hope is that putting lib/ between core/ and gui/ will help clean up
gui code, since everything will no longer be in a single place.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
---
 Sconstruct        |  5 +++--
 gui/main.cpp      | 11 +++--------
 include/lib/lib.h | 10 ++++++++++
 lib/Sconscript    |  3 +++
 lib/lib.cpp       | 19 +++++++++++++++++++
 5 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 include/lib/lib.h
 create mode 100644 lib/Sconscript
 create mode 100644 lib/lib.cpp

diff --git a/Sconstruct b/Sconstruct
index bbb38e93..a65c41ec 100644
--- a/Sconstruct
+++ b/Sconstruct
@@ -42,7 +42,8 @@ Export("env", "test_env")
 
 include = SConscript("include/Sconscript")
 core = SConscript("core/Sconscript")
-gui = SConscript("gui/Sconscript")
+lib  = SConscript("lib/Sconscript")
+gui  = SConscript("gui/Sconscript")
 
 tests = SConscript("tests/Sconscript")
 Clean(tests, Glob("*.gcov"))
@@ -50,7 +51,7 @@ Clean(tests, Glob("tests/*.gcda"))
 Clean(tests, Glob("tests/*.gcno"))
 
 
-ocarina = env.Program("bin/ocarina", core + gui)
+ocarina = env.Program("bin/ocarina", core + lib + gui)
 Default(ocarina)
 Clean(ocarina, "bin/")
 
diff --git a/gui/main.cpp b/gui/main.cpp
index 70d9b3fd..cdd94749 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <core/audio.h>
-#include <core/deck.h>
-#include <core/library.h>
 #include <core/playlist.h>
+#include <lib/lib.h>
 #include <gui/ocarina.h>
 #include <gui/tabs.h>
 
@@ -28,11 +26,8 @@ const std::string share_file(const std::string &file)
 Gtk::Window *ocarina_init(int *argc, char ***argv)
 {
 	Gtk::Window *window = setup_gui();
-	tagdb :: init();
-	library::init();
-	playlist::init();
-	deck::init();
-	audio::init(argc, argv);
+
+	lib :: init(argc, argv);
 
 	playlist :: select("Favorites");
 	share_file("ocarina6.glade");
diff --git a/include/lib/lib.h b/include/lib/lib.h
new file mode 100644
index 00000000..09a24c46
--- /dev/null
+++ b/include/lib/lib.h
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2014 (c) Anna Schumaker.
+ */
+
+namespace lib
+{
+
+	void init(int *, char ***);
+
+}
diff --git a/lib/Sconscript b/lib/Sconscript
new file mode 100644
index 00000000..10f42567
--- /dev/null
+++ b/lib/Sconscript
@@ -0,0 +1,3 @@
+#!/usr/bin/python
+res = Glob("*.cpp")
+Return("res")
diff --git a/lib/lib.cpp b/lib/lib.cpp
new file mode 100644
index 00000000..bad10534
--- /dev/null
+++ b/lib/lib.cpp
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 (c) Anna Schumaker.
+ */
+#include <core/audio.h>
+#include <core/deck.h>
+#include <core/library.h>
+#include <core/playlist.h>
+#include <core/tags.h>
+#include <lib/lib.h>
+
+
+void lib :: init(int *argc, char ***argv)
+{
+	tagdb :: init();
+	library :: init();
+	playlist :: init();
+	deck :: init();
+	audio :: init(argc, argv);
+}