Merge branch 'master' of https://github.com/lesderid/ympd into lesderid-master

diff --cc contrib/init.debian
index 163b7ef4f38bdd3fdb0790368b2b69c96799b74c,31c00d3971e5b40dfbb3726b057094885352d922..943e4de454d5b32957ef67cc91cd5b5366503c5d
--- 1/contrib/init.debian
--- 2/contrib/init.debian
+++ b/contrib/init.debian
@@@ -35,7 -36,7 +36,7 @@@ DIRBLE_API_TOKEN=2e223c9909593b94fc6577
  # Load the VERBOSE setting and other rcS variables
  [ -f /etc/default/rcS ] && . /etc/default/rcS
  
- DAEMON_OPT="--user $YMPD_USER --mpdpass '$MPD_PASSWORD' --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT"
 -DAEMON_OPT="--user $YMPD_USER --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT --dirbletoken $DIRBLE_API_TOKEN"
++DAEMON_OPT="--user $YMPD_USER --mpdpass '$MPD_PASSWORD' --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT --dirbletoken $DIRBLE_API_TOKEN"
  
  do_start()
  {

diff --cc contrib/ympd.default
index e5e7c74a0b6d402ef901c8861ac0c729ad37f8dd,c74b860b8d088c2153500b4c2ae000f0c116ab8a..cb3ca72cbb668c01f30937a1b3bcf3f9863a8889
--- 1/contrib/ympd.default
--- 2/contrib/ympd.default
+++ b/contrib/ympd.default
@@@ -1,5 -1,5 +1,6 @@@
  MPD_HOST=localhost
  MPD_PORT=6600
 +MPD_PASSWORD=
  WEB_PORT=8080
  YMPD_USER=nobody
+ DIRBLE_API_TOKEN=2e223c9909593b94fc6577361a

diff --cc contrib/ympd.service
index 023b92612018f5e19dd9723438077b865498ad9f,751681808b47c7c600526bee06d58826cdcd2179..7b42ebbb368b01243f79b78fff7685d60c45a870
--- 1/contrib/ympd.service
--- 2/contrib/ympd.service
+++ b/contrib/ympd.service
@@@ -5,11 -5,11 +5,12 @@@ Requires=network.target local-fs.targe
  [Service]
  Environment=MPD_HOST=localhost
  Environment=MPD_PORT=6600
 +Environment=MPD_PASSWORD=
  Environment=WEB_PORT=8080
  Environment=YMPD_USER=nobody
+ Environment=DIRBLE_API_TOKEN=2e223c9909593b94fc6577361a
  EnvironmentFile=/etc/default/ympd
- ExecStart=/usr/bin/ympd --user $YMPD_USER --mpdpass "$MPD_PASSWORD" --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT
 -ExecStart=/usr/bin/ympd --user $YMPD_USER --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT --dirbletoken $DIRBLE_API_TOKEN
++ExecStart=/usr/bin/ympd --user $YMPD_USER --mpdpass "$MPD_PASSWORD" --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT --dirbletoken $DIRBLE_API_TOKE
  Type=simple
  
  [Install]

diff --cc htdocs/js/mpd.js
index 56984aa3e137e8f6bcd22324f01223752cb796f5,6e57d2669e40debdccbb819fddac1b98a1f2c03d..5c8a8d1751a476b13b0d2118e42d67d9ac8df097
--- 1/htdocs/js/mpd.js
--- 2/htdocs/js/mpd.js
+++ b/htdocs/js/mpd.js
@@@ -29,7 -29,8 +29,9 @@@ var dirble_selected_cat = ""
  var dirble_catid = "";
  var dirble_page = 1;
  var isTouch = Modernizr.touch ? 1 : 0;
 +var filter = undefined;
+ var dirble_api_token = "";
+ var dirble_stations = false;
  
  var app = $.sammy(function() {
  

diff --cc src/mpd_client.c
Simple merge

diff --cc src/mpd_client.h
Simple merge

diff --cc src/ympd.c
index 304f5b8e251c8e3660be5cb70ab55433b61b8d80,caa02f76a538c93e7c0213c773a135f6a63a1427..00b82ee8d3c0a87f8fd98653bac291e582da60fe
--- 1/src/ympd.c
--- 2/src/ympd.c
+++ b/src/ympd.c
@@@ -122,8 -124,8 +128,9 @@@ int main(int argc, char **argv
                          " -p, --port <port>\t\tconnect to mpd at port [6600]\n"
                          " -w, --webport [ip:]<port>\tlisten interface/port for webserver [8080]\n"
                          " -u, --user <username>\t\tdrop priviliges to user after socket bind\n"
+                         " -d, --dirbletoken <apitoken>\tDirble API token\n"
                          " -V, --version\t\t\tget version\n"
 +                        " -m, --mpdpass <password>\tspecifies the password to use when connecting to mpd\n"
                          " --help\t\t\t\tthis help\n"
                          , argv[0]);
                  return EXIT_FAILURE;