summaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorJon Bergli Heier <snakebite@jvnv.net>2010-12-29 23:27:06 +0100
committerJon Bergli Heier <snakebite@jvnv.net>2010-12-29 23:27:06 +0100
commit757edd54cca1d3bc19617284bba5d008a976f704 (patch)
tree53b1c4b0293e3fa91e642b5e4d6d404f9d05827b /main.cpp
parent5d94fe647e59aaec7775f1e1bd4a4982b677af01 (diff)
Read music root and httpd port from audist.conf.
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index 19695cf..dc96f5a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,3 +1,4 @@
+#include "config.h"
#include "music.h"
#include "decoder.h"
#include "encoder.h"
@@ -10,13 +11,14 @@
int main(int argc, char **argv) {
try {
- music::init(argv[1]);
+ config::init();
+ music::init(config::vm["audist.music_root"].as<std::string>());
decoder::init();
encoder::init();
boost::asio::io_service io_service;
- HTTP::Server httpd(io_service, tcp::endpoint(tcp::v6(), 8000));
+ HTTP::Server httpd(io_service, tcp::endpoint(tcp::v6(), config::vm["audist.httpd_port"].as<int>()));
std::vector<boost::shared_ptr<boost::thread> > threads;
for(std::size_t i = 0; i < 10; i++) {