summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.c2
-rw-r--r--music.c10
-rw-r--r--music.h2
3 files changed, 10 insertions, 4 deletions
diff --git a/main.c b/main.c
index a037c7b..1a7ba2c 100644
--- a/main.c
+++ b/main.c
@@ -20,7 +20,7 @@ int main(int argc, char **argv) {
conf_load();
- music_init(argv[1]);
+ music_init();
music_scan_root();
server_start();
diff --git a/music.c b/music.c
index c81d4dd..559abc4 100644
--- a/music.c
+++ b/music.c
@@ -1,13 +1,19 @@
#include "music.h"
+#include "conf.h"
#include <glib/gstdio.h>
#include <string.h>
struct directory *music_root = NULL;
-gboolean music_init(const gchar *path) {
+gboolean music_init() {
+ gchar *path = conf_get_string("audist", "music_root");
+ if(path == NULL) {
+ g_error("no music_root is set!");
+ }
+
music_root = g_new0(struct directory, 1);
- music_root->path = g_strdup(path);
+ music_root->path = path;
g_debug("added music root %s", path);
diff --git a/music.h b/music.h
index 5ad5971..7a4fe32 100644
--- a/music.h
+++ b/music.h
@@ -20,7 +20,7 @@ struct directory {
extern struct directory *music_root;
-gboolean music_init(const gchar *path);
+gboolean music_init();
gboolean music_scan(struct directory *directory);
gboolean music_scan_root();
struct directory *music_find_dir(const gchar *path);