Rename lib/ -> core/

I plan to introduce a new lib/ that sits between the gui and the backend
files (similar to how glibc sits between the kernel and userspace).
This gets the rename out of the way before I change my mind again.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>

.gitignore

@@ -6,6 +6,7 @@ share/ocarina/#*
 bin/
 .sconsign.dblite
 *.patch
+tests/*-core
 tests/*-lib
 *.gcov
 *.gcda

Sconstruct

@@ -41,7 +41,7 @@ Export("env", "test_env")
 
 
 include = SConscript("include/Sconscript")
-lib = SConscript("lib/Sconscript")
+core = SConscript("core/Sconscript")
 gui = SConscript("gui/Sconscript")
 
 tests = SConscript("tests/Sconscript")
@@ -50,7 +50,7 @@ Clean(tests, Glob("tests/*.gcda"))
 Clean(tests, Glob("tests/*.gcno"))
 
 
-ocarina = env.Program("bin/ocarina", lib + gui)
+ocarina = env.Program("bin/ocarina", core + gui)
 Default(ocarina)
 Clean(ocarina, "bin/")
 

core/audio.cpp

@@ -1,10 +1,10 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <lib/audio.h>
-#include <lib/callback.h>
-#include <lib/deck.h>
-#include <lib/driver.h>
+#include <core/audio.h>
+#include <core/callback.h>
+#include <core/deck.h>
+#include <core/driver.h>
 
 #include <sstream>
 #include <string.h>

core/callback.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <lib/callback.h>
+#include <core/callback.h>
 
 
 static void no_op() {}

core/database.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <lib/database.h>
+#include <core/database.h>
 
 
 DatabaseEntry :: DatabaseEntry()

core/deck.cpp

@@ -1,10 +1,10 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <lib/callback.h>
-#include <lib/deck.h>
-#include <lib/file.h>
-#include <lib/library.h>
+#include <core/callback.h>
+#include <core/deck.h>
+#include <core/file.h>
+#include <core/library.h>
 
 
 class RecentQueue : public Queue

core/driver.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <lib/driver.h>
+#include <core/driver.h>
 
 
 Driver :: Driver() {}

core/file.cpp

@@ -1,8 +1,8 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <lib/error.h>
-#include <lib/file.h>
+#include <core/error.h>
+#include <core/file.h>
 
 #include <glib.h>
 

core/filter.cpp

@@ -2,8 +2,8 @@
  * Copyright 2013 (c) Anna Schumaker.
  */
 
-#include <lib/filter.h>
-#include <lib/index.h>
+#include <core/filter.h>
+#include <core/index.h>
 
 #include <algorithm>
 #include <list>

core/idle.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <lib/idle.h>
+#include <core/idle.h>
 
 #include <queue>
 

core/index.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <lib/index.h>
+#include <core/index.h>
 
 
 IndexEntry :: IndexEntry() {}

core/library.cpp

@@ -1,8 +1,8 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <lib/idle.h>
-#include <lib/library.h>
+#include <core/idle.h>
+#include <core/library.h>
 
 #include <glib.h>
 

core/playlist.cpp

@@ -1,8 +1,8 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <lib/library.h>
-#include <lib/playlist.h>
+#include <core/library.h>
+#include <core/playlist.h>
 
 
 class PlaylistQueue : public Queue {

core/queue.cpp

@@ -1,9 +1,9 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <lib/callback.h>
-#include <lib/queue.h>
-#include <lib/random.h>
+#include <core/callback.h>
+#include <core/queue.h>
+#include <core/random.h>
 
 #include <algorithm>
 #include <sstream>

core/random.cpp

@@ -3,7 +3,7 @@
  */
 #ifdef CONFIG_TEST
 
-#include <lib/random.h>
+#include <core/random.h>
 
 static unsigned int _random_value = 0;
 

core/tags.cpp

@@ -2,9 +2,9 @@
  * Copyright 2014 (c) Anna Schumaker.
  */
 
-#include <lib/tags.h>
-#include <lib/filter.h>
-#include <lib/print.h>
+#include <core/tags.h>
+#include <core/filter.h>
+#include <core/print.h>
 
 #include <sstream>
 #include <taglib/tag.h>

gui/collection.cpp

@@ -1,9 +1,9 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <lib/deck.h>
-#include <lib/library.h>
-#include <lib/playlist.h>
+#include <core/deck.h>
+#include <core/library.h>
+#include <core/playlist.h>
 #include <gui/tabs.h>
 
 

gui/collection_mgr.cpp

@@ -1,8 +1,8 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <lib/callback.h>
-#include <lib/library.h>
+#include <core/callback.h>
+#include <core/library.h>
 #include <gui/ocarina.h>
 
 static void on_library_add(unsigned int id, Library *library);

gui/gui.cpp

@@ -1,13 +1,13 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <lib/audio.h>
-#include <lib/callback.h>
-#include <lib/deck.h>
-#include <lib/driver.h>
-#include <lib/idle.h>
-#include <lib/playlist.h>
-#include <lib/print.h>
+#include <core/audio.h>
+#include <core/callback.h>
+#include <core/deck.h>
+#include <core/driver.h>
+#include <core/idle.h>
+#include <core/playlist.h>
+#include <core/print.h>
 
 #include <gui/ocarina.h>
 #include <gui/tabs.h>

gui/history.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <lib/deck.h>
+#include <core/deck.h>
 #include <gui/tabs.h>
 
 

gui/main.cpp

@@ -1,10 +1,10 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <lib/audio.h>
-#include <lib/deck.h>
-#include <lib/library.h>
-#include <lib/playlist.h>
+#include <core/audio.h>
+#include <core/deck.h>
+#include <core/library.h>
+#include <core/playlist.h>
 #include <gui/ocarina.h>
 #include <gui/tabs.h>
 

gui/model.cpp

@@ -4,7 +4,7 @@
  * See the example at:
  * https://git.gnome.org/browse/gtkmm-documentation/tree/examples/others/treemodelcustom
  */
-#include <lib/audio.h>
+#include <core/audio.h>
 #include <gui/ocarina.h>
 #include <stdlib.h>
 #include <sstream>

gui/playlist.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <lib/playlist.h>
+#include <core/playlist.h>
 #include <gui/tabs.h>
 
 

gui/queue.cpp

@@ -1,8 +1,8 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <lib/callback.h>
-#include <lib/deck.h>
+#include <core/callback.h>
+#include <core/deck.h>
 #include <gui/tabs.h>
 
 #include <map>

gui/tabs.cpp

@@ -1,10 +1,10 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <lib/callback.h>
-#include <lib/deck.h>
-#include <lib/filter.h>
-#include <lib/playlist.h>
+#include <core/callback.h>
+#include <core/deck.h>
+#include <core/filter.h>
+#include <core/playlist.h>
 #include <gui/tabs.h>
 
 #include <map>

include/core/audio.h

@@ -4,7 +4,7 @@
 #ifndef OCARINA_AUDIO_H
 #define OCARINA_AUDIO_H
 
-#include <lib/tags.h>
+#include <core/tags.h>
 #include <string>
 
 namespace audio

include/core/callback.h

@@ -4,8 +4,8 @@
 #ifndef OCARINA_CALLBACK_H
 #define OCARINA_CALLBACK_H
 
-#include <lib/library.h>
-#include <lib/queue.h>
+#include <core/library.h>
+#include <core/queue.h>
 
 
 struct Callbacks {

include/core/database.h

@@ -4,7 +4,7 @@
 #ifndef OCARINA_DATABASE_H
 #define OCARINA_DATABASE_H
 
-#include <lib/file.h>
+#include <core/file.h>
 
 #include <map>
 #include <vector>

include/core/deck.h

@@ -4,7 +4,7 @@
 #ifndef OCARINA_DECK_H
 #define OCARINA_DECK_H
 
-#include <lib/queue.h>
+#include <core/queue.h>
 #include <list>
 
 

include/core/index.h

@@ -4,7 +4,7 @@
 #ifndef OCARINA_INDEX_H
 #define OCARINA_INDEX_H
 
-#include <lib/database.h>
+#include <core/database.h>
 
 #include <set>
 #include <string>

include/core/library.h

@@ -4,8 +4,8 @@
 #ifndef OCARINA_LIBRARY_H
 #define OCARINA_LIBRARY_H
 
-#include <lib/queue.h>
-#include <lib/tags.h>
+#include <core/queue.h>
+#include <core/tags.h>
 #include <string>
 
 namespace library

include/core/playlist.h

@@ -4,8 +4,8 @@
 #ifndef OCARINA_PLAYLIST_H
 #define OCARINA_PLAYLIST_H
 
-#include <lib/index.h>
-#include <lib/queue.h>
+#include <core/index.h>
+#include <core/queue.h>
 
 #include <string>
 

include/core/queue.h

@@ -4,8 +4,8 @@
 #ifndef OCARINA_QUEUE_H
 #define OCARINA_QUEUE_H
 
-#include <lib/file.h>
-#include <lib/tags.h>
+#include <core/file.h>
+#include <core/tags.h>
 
 #include <vector>
 #include <list>

include/core/tags.h

@@ -4,7 +4,7 @@
 #ifndef OCARINA_TAGS_H
 #define OCARINA_TAGS_H
 
-#include <lib/database.h>
+#include <core/database.h>
 
 
 enum sort_t {

include/gui/ocarina.h

@@ -4,7 +4,7 @@
 #ifndef OCARINA_H
 #define OCARINA_H
 
-#include <lib/queue.h>
+#include <core/queue.h>
 #include <gtkmm.h>
 
 

include/gui/tabs.h

@@ -5,7 +5,7 @@
 #define OCARINA_TABS_H
 
 #include <gui/ocarina.h>
-#include <lib/queue.h>
+#include <core/queue.h>
 #include <set>
 
 class Tab {

tests/Sconscript

@@ -41,7 +41,7 @@ for arg in sys.argv:
 def expand_files(extra_files):
 	res = []
 	for f in extra_files:
-		res += [ env.Object("%s-lib" % f, "../lib/%s" % f) ]
+		res += [ env.Object("%s-core" % f, "../core/%s" % f) ]
 	return res
 
 def make_program(src, name, extra_files):

tests/audio.cpp

@@ -1,9 +1,9 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <lib/audio.h>
-#include <lib/driver.h>
-#include <lib/library.h>
+#include <core/audio.h>
+#include <core/driver.h>
+#include <core/library.h>
 #include "test.h"
 
 Track *TRACK_NULL = NULL;

tests/database.cpp

@@ -3,7 +3,7 @@
  * Test a Database
  */
 
-#include <lib/database.h>
+#include <core/database.h>
 #include "test.h"
 
 #include <sstream>

tests/deck.cpp

@@ -1,9 +1,9 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <lib/callback.h>
-#include <lib/deck.h>
-#include <lib/library.h>
+#include <core/callback.h>
+#include <core/deck.h>
+#include <core/library.h>
 #include "test.h"
 
 static Queue *Q_NULL = NULL;

tests/driver.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <lib/driver.h>
+#include <core/driver.h>
 #include "test.h"
 
 static TestDriver *DRIVER_NULL = NULL;

tests/file.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <lib/file.h>
+#include <core/file.h>
 #include "test.h"
 
 

tests/filter.cpp

@@ -3,7 +3,7 @@
  * Test the filtering code
  */
 
-#include <lib/filter.h>
+#include <core/filter.h>
 #include "test.h"
 
 static void do_test_lowercase(const std::string &text, const std::string &lc)

tests/idle.cpp

@@ -3,7 +3,7 @@
  * Test the idle queue
  */
 
-#include <lib/idle.h>
+#include <core/idle.h>
 #include "test.h"
 
 #include <sstream>

tests/index.cpp

@@ -3,7 +3,7 @@
  * Test a Database
  */
 
-#include <lib/index.h>
+#include <core/index.h>
 #include "test.h"
 
 #include <sstream>

tests/library.cpp

@@ -1,8 +1,8 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <lib/idle.h>
-#include <lib/library.h>
+#include <core/idle.h>
+#include <core/library.h>
 #include "test.h"
 
 static Queue *Q_NULL = NULL;

tests/playlist.cpp

@@ -1,8 +1,8 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <lib/library.h>
-#include <lib/playlist.h>
+#include <core/library.h>
+#include <core/playlist.h>
 #include "test.h"
 
 static IndexEntry *IDX_NULL = NULL;

tests/queue.cpp

@@ -1,10 +1,10 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <lib/callback.h>
-#include <lib/queue.h>
-#include <lib/random.h>
-#include <lib/tags.h>
+#include <core/callback.h>
+#include <core/queue.h>
+#include <core/random.h>
+#include <core/tags.h>
 #include "test.h"
 
 

tests/random.cpp

@@ -2,7 +2,7 @@
  * Copyright 2014 (c) Anna Schumaker.
  */
 
-#include <lib/random.h>
+#include <core/random.h>
 #include "test.h"
 
 #include <sstream>

tests/tags.cpp

@@ -3,7 +3,7 @@
  * Test a DatabaseEntry
  */
 
-#include <lib/tags.h>
+#include <core/tags.h>
 #include "test.h"
 
 static Library *LIB_NULL = NULL;

tests/version.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <lib/version.h>
+#include <core/version.h>
 #include "test.h"
 
 #ifdef CONFIG_DEBUG