Header file roundup

Create include/lib/ and include/gui/.  Move header files into the
appropriate directory.

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

gui/collection.cpp

@@ -1,10 +1,10 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <deck.h>
+#include <lib/deck.h>
-#include <library.h>
+#include <lib/library.h>
-#include <playlist.h>
+#include <lib/playlist.h>
-#include <tabs.h>
+#include <gui/tabs.h>
 
 
 class CollectionTab : public Tab {

gui/collection_mgr.cpp

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

gui/gui.cpp

@@ -1,16 +1,16 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <audio.h>
+#include <lib/audio.h>
-#include <callback.h>
+#include <lib/callback.h>
-#include <deck.h>
+#include <lib/deck.h>
-#include <driver.h>
+#include <lib/driver.h>
-#include <idle.h>
+#include <lib/idle.h>
-#include <playlist.h>
+#include <lib/playlist.h>
+#include <lib/print.h>
 
-#include <ocarina.h>
+#include <gui/ocarina.h>
-#include <print.h>
+#include <gui/tabs.h>
-#include <tabs.h>
 
 static bool audio_playing = false;
 static Glib::RefPtr<Gtk::Builder> builder;

gui/history.cpp

@@ -1,8 +1,8 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <deck.h>
+#include <lib/deck.h>
-#include <tabs.h>
+#include <gui/tabs.h>
 
 
 class HistoryTab : public Tab {

gui/main.cpp

@@ -1,12 +1,12 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <audio.h>
+#include <lib/audio.h>
-#include <deck.h>
+#include <lib/deck.h>
-#include <library.h>
+#include <lib/library.h>
-#include <ocarina.h>
+#include <lib/playlist.h>
-#include <playlist.h>
+#include <gui/ocarina.h>
-#include <tabs.h>
+#include <gui/tabs.h>
 
 const std::string share_file(const std::string &file)
 {

gui/model.cpp

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

gui/playlist.cpp

@@ -1,8 +1,8 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <playlist.h>
+#include <lib/playlist.h>
-#include <tabs.h>
+#include <gui/tabs.h>
 
 
 static const std::string current_playlist();

gui/queue.cpp

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

gui/tabs.cpp

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

include/gui/ocarina.h

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

include/gui/tabs.h

@@ -4,8 +4,8 @@
 #ifndef OCARINA_TABS_H
 #define OCARINA_TABS_H
 
-#include <ocarina.h>
+#include <gui/ocarina.h>
-#include <queue.h>
+#include <lib/queue.h>
 #include <set>
 
 class Tab {

include/lib/audio.h

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

include/lib/callback.h

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

include/lib/database.h

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

include/lib/deck.h

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

include/lib/index.h

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

include/lib/library.h

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

include/lib/playlist.h

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

include/lib/queue.h

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

include/lib/tags.h

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

lib/audio.cpp

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

lib/callback.cpp

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

lib/database.cpp

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

lib/deck.cpp

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

lib/driver.cpp

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

lib/file.cpp

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

lib/filter.cpp

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

lib/idle.cpp

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

lib/index.cpp

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

lib/library.cpp

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

lib/playlist.cpp

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

lib/queue.cpp

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

lib/random.cpp

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

lib/tags.cpp

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

tests/audio.cpp

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

tests/database.cpp

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

tests/deck.cpp

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

tests/driver.cpp

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

tests/file.cpp

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

tests/filter.cpp

@@ -3,7 +3,7 @@
  * Test the filtering code
  */
 
-#include <filter.h>
+#include <lib/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 <idle.h>
+#include <lib/idle.h>
 #include "test.h"
 
 #include <sstream>

tests/index.cpp

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

tests/library.cpp

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

tests/playlist.cpp

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

tests/queue.cpp

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

tests/random.cpp

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

tests/tags.cpp

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

tests/version.cpp

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