- Increased minor version

- Added JSON MySQLdb example
- Added feature in README

diff --git a/README.rst b/README.rst
index 60a0b4220459925b82f4ebc59c80dc61582abf92..bbc6d7dbb3893f6954b606f2637c6e25276a3b23 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -35,6 +35,7 @@ Features
  * Very light and optimized streaming process
  * Fully written in Python
  * Works with Icecast2, ShoutCast, Stream-m
+ * (NEW) Works with MySQL playlists
 
 Because our aim is to get DeeFuzzer as light as possible it is NOT capable of re-encoding or transcoding media files for the moment.
 

diff --git a/example/deefuzzer.json b/example/deefuzzer.json
index 24a71bb07f27822a9a112c766ab45737b4f7a03d..f5bb4cf313224309bf888f401bb06ef0651e9087 100644 (file)
--- a/example/deefuzzer.json
+++ b/example/deefuzzer.json
@@ -48,7 +48,7 @@
                 "ogg_quality": 4,
                 "samplerate": 48000,
                 "shuffle": 0,
-                "voices": "2"
+                "voices": 2
             },
             "record": {
                 "dir": "/path/to/archives",
@@ -83,6 +83,32 @@
                 "secret": "your access token secret key",
                 "tags": "parisson deefuzzer"
             }
+        },
+        "station": {
+          "infos": {
+              "description": "MySQL funky playlist",
+              "genre": "Various Funk Groove",
+              "name": "My best funky station",
+              "short_name": "My_station2",
+              "url": "http://parisson.com"
+          },
+          "media": {
+              "bitrate": 96,
+              "format": "mp3",
+              "ogg_quality": 4,
+              "samplerate": 48000,
+              "shuffle": 0,
+              "voices": 2,
+                               "mysql": {
+                "host": "127.0.0.1",
+                "port": 3306,
+                                       "user": "username",
+                                       "password": "password",
+                                       "database": "deefuzze_database",
+                                       "table": "deefuzze_playlist",
+                                       "field": "mp3"
+                               }
+          }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/setup.py b/setup.py
index 2c72f7a5b8e1988c06d725aa57feb31b64e847c1..d547e99fc76a60d9e53719f35aeba8fc43f6b10a 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ setup(
     long_description=open('README.rst').read(),
     author="Guillaume Pellerin",
     author_email="yomguy@parisson.com",
-    version='0.7.1',
+    version='0.7.2',
     install_requires=[
         'setuptools',
         'python-shout',