summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorJon Bergli Heier <snakebite@jvnv.net>2010-08-20 20:36:38 +0200
committerJon Bergli Heier <snakebite@jvnv.net>2010-08-20 20:36:38 +0200
commit2d2b889bb25f9db008bdac54babf84c2120d2a45 (patch)
tree1b1154fd5c692ad99d3c16ae7768647185687f6c /main.c
parent02f779da234da8c17300ca849f9a2c1f8d4a48e0 (diff)
Implemented some basic configuration stuff.
Diffstat (limited to 'main.c')
-rw-r--r--main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main.c b/main.c
index 3339ae9..a037c7b 100644
--- a/main.c
+++ b/main.c
@@ -1,6 +1,7 @@
#include "music.h"
#include "httpd.h"
#include "command_service.h"
+#include "conf.h"
#include <glib.h>
#include <glib-object.h>
@@ -17,6 +18,8 @@ static void sig_handler(int sig) {
int main(int argc, char **argv) {
g_type_init();
+ conf_load();
+
music_init(argv[1]);
music_scan_root();
@@ -33,5 +36,7 @@ int main(int argc, char **argv) {
server_stop();
music_free();
+ conf_free();
+
return 0;
}