libsaria: Move header files out of include/libsaria/

Ocarina no longer has a header file subdirectory so there is no reason
to have a libsaria subdirectory anymore.  Putting header files directly
in the include/ directory is a bit simpler.

Signed-off-by: Bryan Schumaker <bjschuma@gmail.com>

include/ban.h

@@ -1,6 +1,6 @@
 #ifndef LIBSARIA_BAN_H
 #define LIBSARIA_BAN_H
-#include <libsaria/track.h>
+#include <track.h>
 
 namespace libsaria
 {

include/deck.h

@@ -1,8 +1,8 @@
 #ifndef LIBSARIA_PLAYLIST_STACK_H
 #define LIBSARIA_PLAYLIST_STACK_H
 
-#include <libsaria/playlist.h>
-#include <libsaria/list.h>
+#include <playlist.h>
+#include <list.h>
 
 #define MAX_PLAYLISTS 10
 

include/idle.h

@@ -1,7 +1,7 @@
 #ifndef LIBSARIA_IDLE_H
 #define LIBSARIA_IDLE_H
 
-#include <libsaria/task.h>
+#include <task.h>
 
 namespace libsaria
 {

include/library.h

@@ -1,10 +1,10 @@
 #ifndef LIBSARIA_LIBRARY_H
 #define LIBSARIA_LIBRARY_H
 
-#include <libsaria/fs.h>
-#include <libsaria/list.h>
-#include <libsaria/track.h>
-#include <libsaria/playlist.h>
+#include <fs.h>
+#include <list.h>
+#include <track.h>
+#include <playlist.h>
 
 #include <string>
 using namespace std;

include/libsaria.h

@@ -1,8 +1,8 @@
 #ifndef LIBSARIA_H
 #define LIBSARIA_H
 
-#include <libsaria/notify.h>
-#include <libsaria/track.h>
+#include <notify.h>
+#include <track.h>
 
 namespace libsaria
 {

include/list.h

@@ -51,7 +51,7 @@ namespace libsaria
 
 };
 
-#include "../../libsaria/list/node.cpp"
-#include "../../libsaria/list/list.cpp"
+#include "../libsaria/list/node.cpp"
+#include "../libsaria/list/list.cpp"
 
 #endif /* LIBSARIA_LIST_H */

include/path.h

@@ -1,7 +1,7 @@
 #ifndef LIBSARIA_PATH_H
 #define LIBSARIA_PATH_H
 
-#include <libsaria/track.h>
+#include <track.h>
 
 #include <string>
 #include <list>

include/playlist.h

@@ -2,9 +2,9 @@
 #ifndef LIBSARIA_PLAYLIST_H
 #define LIBSARIA_PLAYLIST_H
 
-#include <libsaria/notify.h>
-#include <libsaria/index.h>
-#include <libsaria/fs.h>
+#include <notify.h>
+#include <index.h>
+#include <fs.h>
 
 #include <list>
 #include <string>

include/task.h

@@ -1,7 +1,7 @@
 #ifndef LIBSARIA_IDLE_TASK_H
 #define LIBSARIA_IDLE_TASK_H
 
-#include <libsaria/fs.h>
+#include <fs.h>
 #include <cstddef>
 
 class IdleTask

include/track.h

@@ -1,7 +1,7 @@
 #ifndef LIBSARIA_TRACK_H
 #define LIBSARIA_TRACK_H
 
-#include <libsaria/playlist.h>
+#include <playlist.h>
 
 #include <list>
 #include <string>

libsaria/audio/alsa.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) 2012 Bryan Schumaker.
 #include <gst/interfaces/propertyprobe.h>
-#include <libsaria/audio.h>
-#include <libsaria/prefs.h>
-#include <libsaria/print.h>
+#include <audio.h>
+#include <prefs.h>
+#include <print.h>
 #include "audio.h"
 
 #include <list>

libsaria/audio/audio.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/audio.h>
-#include <libsaria/print.h>
-#include <libsaria/library.h>
-#include <libsaria/deck.h>
+#include <audio.h>
+#include <print.h>
+#include <library.h>
+#include <deck.h>
 #include "audio.h"
 
 GstElement *player = NULL;

libsaria/audio/controls.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/notify.h>
-#include <libsaria/audio.h>
-#include <libsaria/print.h>
-#include <libsaria/path.h>
+#include <notify.h>
+#include <audio.h>
+#include <print.h>
+#include <path.h>
 #include "audio.h"
 
 static GstState cur_state = GST_STATE_READY;

libsaria/audio/progress.cpp

@@ -2,7 +2,7 @@
 #include <sstream>
 using namespace std;
 
-#include <libsaria/audio.h>
+#include <audio.h>
 #include "audio.h"
 
 static bool get_duration(gint64 &duration)

libsaria/audio/volume.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/audio.h>
-#include <libsaria/prefs.h>
+#include <audio.h>
+#include <prefs.h>
 #include "audio.h"
 
 void configure_volume(float volume)

libsaria/ban.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) 2012 Bryan Schumaker.
-#include <libsaria/playlist.h>
-#include <libsaria/library.h>
-#include <libsaria/ban.h>
+#include <playlist.h>
+#include <library.h>
+#include <ban.h>
 
 static libsaria::Set banned_plist("Banned", PL_STATIC | PL_NO_DRAIN);
 

libsaria/format.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/format.h>
-#include <libsaria/print.h>
+#include <format.h>
+#include <print.h>
 
 #include <map>
 #include <set>

libsaria/fs.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) 2012 Bryan Schumaker.
-#include <libsaria/fs.h>
-#include <libsaria/task.h>
-#include <libsaria/print.h>
+#include <fs.h>
+#include <task.h>
+#include <print.h>
 
 #include <dirent.h>
 #include <sys/stat.h>

libsaria/idle/idle.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/notify.h>
-#include <libsaria/idle.h>
-#include <libsaria/list.h>
-#include <libsaria/print.h>
+#include <notify.h>
+#include <idle.h>
+#include <list.h>
+#include <print.h>
 
 static libsaria::List<IdleTask *> idle_queue;
 static float queued = 0.0;

libsaria/idle/io_task.cpp

@@ -1,5 +1,5 @@
 // Copyright (c) 2012 Bryan Schumaker.
-#include <libsaria/task.h>
+#include <task.h>
 
 #include <fstream>
 using namespace std;

libsaria/idle/task.cpp

@@ -1,5 +1,5 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/idle.h>
+#include <idle.h>
 
 /*
  * The IdleTask should be constructed through `new` and not

libsaria/index/filter.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/format.h>
-#include <libsaria/track.h>
-#include <libsaria/index.h>
+#include <format.h>
+#include <track.h>
+#include <index.h>
 
 /*
  * Thanks to: http://stackoverflow.com/questions/1773526/in-place-c-set-intersection

libsaria/index/index.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/format.h>
-#include <libsaria/track.h>
-#include <libsaria/index.h>
-#include <libsaria/print.h>
+#include <format.h>
+#include <track.h>
+#include <index.h>
+#include <print.h>
 
 #include <map>
 #include <set>

libsaria/library/file.cpp

@@ -2,12 +2,12 @@
  * Copyright (c) 2011 Bryan Schumaker.
  * Manages the libsaria library save file
  */
-#include <libsaria/library.h>
-#include <libsaria/notify.h>
-#include <libsaria/track.h>
-#include <libsaria/print.h>
-#include <libsaria/ban.h>
-#include <libsaria/fs.h>
+#include <library.h>
+#include <notify.h>
+#include <track.h>
+#include <print.h>
+#include <ban.h>
+#include <fs.h>
 #include "library.h"
 
 #include <stdlib.h>

libsaria/library/library.cpp

@@ -1,14 +1,14 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/playlist.h>
-#include <libsaria/library.h>
-#include <libsaria/notify.h>
-#include <libsaria/audio.h>
-#include <libsaria/track.h>
-#include <libsaria/prefs.h>
-#include <libsaria/deck.h>
-#include <libsaria/idle.h>
-#include <libsaria/ban.h>
-#include <libsaria/fs.h>
+#include <playlist.h>
+#include <library.h>
+#include <notify.h>
+#include <audio.h>
+#include <track.h>
+#include <prefs.h>
+#include <deck.h>
+#include <idle.h>
+#include <ban.h>
+#include <fs.h>
 #include "library.h"
 
 #include <list>

libsaria/library/library.h

@@ -1,8 +1,8 @@
 #ifndef LIBSARIA_LIBRARY_SOURCE_H
 #define LIBSARIA_LIBRARY_SOURCE_H
 
-#include <libsaria/playlist.h>
-#include <libsaria/library.h>
+#include <playlist.h>
+#include <library.h>
 
 extern libsaria::Set lib_playlist;
 

libsaria/library/update.cpp

@@ -1,12 +1,12 @@
 // Copyright (c) 2012 Bryan Schumaker.
-#include <libsaria/library.h>
-#include <libsaria/notify.h>
-#include <libsaria/track.h>
-#include <libsaria/print.h>
-#include <libsaria/deck.h>
-#include <libsaria/list.h>
-#include <libsaria/idle.h>
-#include <libsaria/fs.h>
+#include <library.h>
+#include <notify.h>
+#include <track.h>
+#include <print.h>
+#include <deck.h>
+#include <list.h>
+#include <idle.h>
+#include <fs.h>
 #include "library.h"
 
 static unsigned int MAX_SCAN = 20;

libsaria/libsaria.cpp

@@ -1,16 +1,16 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/libsaria.h>
-#include <libsaria/library.h>
-#include <libsaria/notify.h>
-#include <libsaria/format.h>
-#include <libsaria/prefs.h>
-#include <libsaria/print.h>
-#include <libsaria/audio.h>
-#include <libsaria/index.h>
-#include <libsaria/track.h>
-#include <libsaria/deck.h>
-#include <libsaria/idle.h>
-#include <libsaria/fs.h>
+#include <libsaria.h>
+#include <library.h>
+#include <notify.h>
+#include <format.h>
+#include <prefs.h>
+#include <print.h>
+#include <audio.h>
+#include <index.h>
+#include <track.h>
+#include <deck.h>
+#include <idle.h>
+#include <fs.h>
 
 static libsaria::Track outside_track;
 static libsaria::initdata *app_data;

libsaria/list/list.cpp

@@ -2,8 +2,8 @@
 #ifndef LIBSARIA_LIST_CPP
 #define LIBSARIA_LIST_CPP
 
-#include <libsaria/list.h>
-#include <libsaria/print.h>
+#include <list.h>
+#include <print.h>
 
 #include <assert.h>
 

libsaria/list/node.cpp

@@ -2,7 +2,7 @@
 #ifndef LIBSARIA_NODE_CPP
 #define LIBSARIA_NODE_CPP
 
-#include <libsaria/list.h>
+#include <list.h>
 #include <cstddef>
 
 namespace libsaria

libsaria/path/dir.cpp

@@ -2,7 +2,7 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <stdlib.h>
-#include <libsaria/path.h>
+#include <path.h>
 
 #include <unistd.h>
 #include <iostream>

libsaria/playlist/add.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) 2012 Bryan Schumaker.
-#include <libsaria/playlist.h>
-#include <libsaria/track.h>
-#include <libsaria/print.h>
+#include <playlist.h>
+#include <track.h>
+#include <print.h>
 
 static bool compare_tracks(libsaria::Track *one, libsaria::Track *two)
 {

libsaria/playlist/deck.cpp

@@ -1,11 +1,11 @@
 // Copyright (c) 2012 Bryan Schumaker.
-#include <libsaria/playlist.h>
-#include <libsaria/library.h>
-#include <libsaria/notify.h>
-#include <libsaria/audio.h>
-#include <libsaria/track.h>
-#include <libsaria/print.h>
-#include <libsaria/deck.h>
+#include <playlist.h>
+#include <library.h>
+#include <notify.h>
+#include <audio.h>
+#include <track.h>
+#include <print.h>
+#include <deck.h>
 
 #include <list>
 #include <sstream>

libsaria/playlist/file.cpp

@@ -1,10 +1,10 @@
 // Copyright (c) 2012 Bryan Schumaker.
-#include <libsaria/playlist.h>
-#include <libsaria/library.h>
-#include <libsaria/track.h>
-#include <libsaria/print.h>
-#include <libsaria/deck.h>
-#include <libsaria/idle.h>
+#include <playlist.h>
+#include <library.h>
+#include <track.h>
+#include <print.h>
+#include <deck.h>
+#include <idle.h>
 
 #include <stdlib.h>
 #include <fstream>

libsaria/playlist/next.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) 2012 Bryan Schumaker.
-#include <libsaria/playlist.h>
-#include <libsaria/index.h>
-#include <libsaria/prefs.h>
-#include <libsaria/print.h>
+#include <playlist.h>
+#include <index.h>
+#include <prefs.h>
+#include <print.h>
 
 #include <stdlib.h>
 

libsaria/playlist/playlist.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) 2012 Bryan Schumaker.
-#include <libsaria/index.h>
-#include <libsaria/track.h>
-#include <libsaria/library.h>
-#include <libsaria/playlist.h>
+#include <index.h>
+#include <track.h>
+#include <library.h>
+#include <playlist.h>
 
 namespace libsaria
 {

libsaria/playlist/queue.cpp

@@ -1,5 +1,5 @@
 // Copyright (c) 2012 Bryan Schumaker.
-#include <libsaria/playlist.h>
+#include <playlist.h>
 
 namespace libsaria
 {

libsaria/playlist/set.cpp

@@ -1,5 +1,5 @@
 // Copyright (c) 2012 Bryan Schumaker.
-#include <libsaria/playlist.h>
+#include <playlist.h>
 
 namespace libsaria
 {

libsaria/playlist/stack.cpp

@@ -1,5 +1,5 @@
 // Copyright (c) 2012 Bryan Schumaker.
-#include <libsaria/playlist.h>
+#include <playlist.h>
 
 namespace libsaria
 {

libsaria/prefs.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/print.h>
-#include <libsaria/prefs.h>
-#include <libsaria/fs.h>
+#include <print.h>
+#include <prefs.h>
+#include <fs.h>
 
 #include <map>
 #include <fstream>

libsaria/print.cpp

@@ -4,7 +4,7 @@
 #include <cstdio>
 #include <cstdarg>
 
-#include <libsaria/print.h>
+#include <print.h>
 
 void print(string fmt, ...)
 {

libsaria/remote.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) Bryan Schumaker 2012.
-#include <libsaria/libsaria.h>
-#include <libsaria/audio.h>
-#include <libsaria/print.h>
-#include <libsaria/deck.h>
+#include <libsaria.h>
+#include <audio.h>
+#include <print.h>
+#include <deck.h>
 
 #include <fstream>
 using namespace std;

libsaria/track/get.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/library.h>
-#include <libsaria/track.h>
+#include <library.h>
+#include <track.h>
 
 #include <sstream>
 using namespace std;

libsaria/track/operator.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/track.h>
-#include <libsaria/print.h>
+#include <track.h>
+#include <print.h>
 
 /*
  * Return positive value if s1 > s2

libsaria/track/set.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/library.h>
-#include <libsaria/track.h>
-#include <libsaria/ban.h>
+#include <library.h>
+#include <track.h>
+#include <ban.h>
 
 namespace libsaria
 {

libsaria/track/track.cpp

@@ -1,12 +1,12 @@
 // Copyright (c) 2011 Bryan Schumaker.
-#include <libsaria/library.h>
-#include <libsaria/notify.h>
-#include <libsaria/format.h>
-#include <libsaria/track.h>
-#include <libsaria/audio.h>
-#include <libsaria/prefs.h>
-#include <libsaria/print.h>
-#include <libsaria/deck.h>
+#include <library.h>
+#include <notify.h>
+#include <format.h>
+#include <track.h>
+#include <audio.h>
+#include <prefs.h>
+#include <print.h>
+#include <deck.h>
 
 #include <taglib/tag.h>
 #include <taglib/fileref.h>

ocarina/library.cpp

@@ -1,5 +1,5 @@
 // Copyright (c) 2012 Bryan Schumaker
-#include <libsaria/library.h>
+#include <library.h>
 #include "ocarina.h"
 
 static inline GtkListStore *get_list()

ocarina/notify.cpp

@@ -1,5 +1,5 @@
 // Copyright (c) 2012 Bryan Schumaker.
-#include <libsaria/idle.h>
+#include <idle.h>
 #include "ocarina.h"
 
 static void idle_add()

ocarina/ocarina.cpp

@@ -1,10 +1,10 @@
 // Copyright (c) 2011 Bryan Schumaker
 #include <version.h>
-#include <libsaria/libsaria.h>
-#include <libsaria/notify.h>
-#include <libsaria/audio.h>
-#include <libsaria/deck.h>
-#include <libsaria/idle.h>
+#include <libsaria.h>
+#include <notify.h>
+#include <audio.h>
+#include <deck.h>
+#include <idle.h>
 
 #include "ocarina.h"
 

ocarina/ocarina.h

@@ -1,10 +1,10 @@
 #ifndef OCARINA_H
 #define OCARINA_H
 
-#include <libsaria/notify.h>
-#include <libsaria/track.h>
-#include <libsaria/print.h>
-#include <libsaria/deck.h>
+#include <notify.h>
+#include <track.h>
+#include <print.h>
+#include <deck.h>
 
 #include <gtk/gtk.h>
 #include <string>

ocarina/pipe.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Bryan Schumaker 2012.
-#include <libsaria/libsaria.h>
-#include <libsaria/print.h>
-#include <libsaria/fs.h>
+#include <libsaria.h>
+#include <print.h>
+#include <fs.h>
 
 #include <glib.h>
 #include <string>

ocarina/playlist.cpp

@@ -1,5 +1,5 @@
 // Copyright (c) 2012 Bryan Schumaker
-#include <libsaria/track.h>
+#include <track.h>
 #include <stdlib.h>
 #include "ocarina.h"
 

ocarina/status.cpp

@@ -1,11 +1,11 @@
 // Copyright (c) 2012 Bryan Schumaker
-#include <libsaria/format.h>
-#include <libsaria/audio.h>
-#include <libsaria/track.h>
-#include <libsaria/prefs.h>
-#include <libsaria/deck.h>
-#include <libsaria/idle.h>
-#include <libsaria/ban.h>
+#include <format.h>
+#include <audio.h>
+#include <track.h>
+#include <prefs.h>
+#include <deck.h>
+#include <idle.h>
+#include <ban.h>
 #include "ocarina.h"
 
 #include <sstream>

ocarina/tabs.cpp

@@ -1,9 +1,9 @@
 // Copyright (c) 2011 Bryan Schumaker
-#include <libsaria/libsaria.h>
-#include <libsaria/library.h>
-#include <libsaria/print.h>
-#include <libsaria/deck.h>
-#include <libsaria/ban.h>
+#include <libsaria.h>
+#include <library.h>
+#include <print.h>
+#include <deck.h>
+#include <ban.h>
 
 #include "ocarina.h"
 

ocarina/window.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) 2011 Bryan Schumaker
 #include <version.h>
-#include <libsaria/audio.h>
-#include <libsaria/prefs.h>
+#include <audio.h>
+#include <prefs.h>
 #include "ocarina.h"
 
 static int old_w, old_h;