From: achbed <github@achbed.org>
Date: Wed, 19 Nov 2014 22:16:05 +0000 (-0600)
Subject: Merge branch 'dev-jsonfeed' into dev-dsw
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5f517bd101e9b326e7fe9886d8bca805999a402c;p=deefuzzer.git

Merge branch 'dev-jsonfeed' into dev-dsw

Conflicts:
	deefuzzer/station.py
---

5f517bd101e9b326e7fe9886d8bca805999a402c
diff --cc deefuzzer/station.py
index ad8bbc5,82f418b..f1fec09
--- a/deefuzzer/station.py
+++ b/deefuzzer/station.py
@@@ -72,9 -73,10 +73,11 @@@ class Station(Thread)
      record_mode = 0
      run_mode = 1
      station_dir = None
 +    appendtype = 1
-     feed_json = 0
-     feed_rss = 1
+     feeds_json = 0
+     feeds_rss = 1
+     feeds_mode = 1
+     feeds_playlist = 1
  
      def __init__(self, station, q, logger, m3u):
          Thread.__init__(self)