From: achbed <github@achbed.org>
Date: Thu, 20 Nov 2014 06:15:07 +0000 (-0600)
Subject: Merge branch 'dev-stationfolder' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bbab221d01aa1f70abcc0f2c4494dd46e80b0ef1;p=deefuzzer.git

Merge branch 'dev-stationfolder' into dev

Conflicts:
	deefuzzer/core.py
	deefuzzer/tools/utils.py
---

bbab221d01aa1f70abcc0f2c4494dd46e80b0ef1
diff --cc example/deefuzzer.json
index 2234ded,add4b6e..7f53f86
--- a/example/deefuzzer.json
+++ b/example/deefuzzer.json
@@@ -2,13 -2,13 +2,24 @@@
      "deefuzzer": {
          "log": "/path/to/station.log",
          "m3u": "/path/to/station.m3u",
+         "stationdefaults": {
+             "control": {
+                 "mode": 0,
+                 "port": 16001
+             },
+             "jingles": {
+                 "dir": "/path/to/jingles",
++                "mode": 0,
++                "shuffle": 1
++            }
++        },
 +        "station": {
 +            "control": {
 +                "mode": 0,
 +                "port": 16001
 +            },
 +            "jingles": {
 +                "dir": "/path/to/jingles",
                  "mode": 0,
                  "shuffle": 1
              }