Fix some advises in REAME

diff --git a/INSTALL b/INSTALL
index 105571e8debde416976e54095594a4ed2cf6d8a4..39ac742bfbd517c8f7a72c43a8d4ec33c557c79d 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -12,4 +12,11 @@
  depends : python, python-xml, shout-python, libshout3, icecast2
  recommends : python-mutagen
  provides : shout-python
- 
\ No newline at end of file
+ 
+
+This last library is included in D-Fuzz but needs to be compiled.
+As explained in shout-python/INSTALL, you just have to run this command :
+
+    cd shout-python; sudo python setup.py install
+
+    
\ No newline at end of file

diff --git a/README b/README
index d2a7d105301ec89177608ecf2852a49b631c440a..a9ec2042e788b35e2376b9e2e9092b3eb1d52e99 100644 (file)
--- a/README
+++ b/README
@@ -7,9 +7,11 @@ d-fuzz : a lightweight icecast streaming client written in python
 # 1. Introduction
 # ===============
 
-D-Fuzz is a light python program that streams media data from disks to icecast2 with some metadata. It supports MP3, OGG, SPEEX and THEORA media.
+D-Fuzz is a light python program that streams media data from disks to icecast2
+with some metadata. It supports MP3, OGG, SPEEX and THEORA media.
 
-It is neccessary to provide a config file which sets all needed parameters (see myfuzz.xml for example).
+It is neccessary to provide a config file which sets all needed parameters
+(see example/myfuzz.xml for example).
 
 
 # 2. Installation
@@ -34,8 +36,11 @@ Usage : d-fuzz $1
   where $1 is the path for a XML config file
   ex: d-fuzz ./myfuzz.xml
 
-Note that you must edit the config file with right parameter before executing...
+Note that you must edit the config file with right parameters before executing...
 
+Be carefull : at the moment the Thread implementation raises exceptions when
+shutting down with CTRL + C...
+You have then to kill each stream manually or make a full `pkill d-fuzz` .
  
 # 5. Author
 # =========
@@ -47,10 +52,15 @@ Guillaume Pellerin <yomguy@parisson.com>
 # ==================
 
 This work is inspired by the great - C - Oddsock's streaming program : Ezstream.
-Since I needed to patch it in order to modify the playlist (randomize for example) and make external batch tools to create multiple channels, I decided to rewrite it from scratch in python. Some parts of this work are also taken from another Parisson's project : Telemeta (see http://svn.parisson.org/telemeta).
+Since I needed to patch it in order to modify the playlist (randomize for example)
+and make external batch tools to create multiple channels, I decided to rewrite it
+from scratch in python.
+Some parts of this work are also taken from another Parisson's project : Telemeta
+(see http://svn.parisson.org/telemeta).
 
 
 # 7. Contact / Infos
 # ==================
 
-see http://parisson.com/d-fuzz/ for more details
+see http://svn.parisson.org/d-fuzz/  or  http://parisson.com  for more details
+

diff --git a/d-fuzz.py b/d-fuzz.py
index 8db9c28cd073b0d484b1897e039558bbc7dc1296..d4c978f257ec3b1b672fc1db87d499c26cb11e5c 100755 (executable)
--- a/d-fuzz.py
+++ b/d-fuzz.py
@@ -81,7 +81,7 @@ class DFuzz:
         for i in range(0,nb_stations):
             station = self.conf['d-fuzz']['station'][i]
             channels = int(station['infos']['channels'])
-            print 'Station n°%s : %s channels' % (str(i), str(channels))
+            print 'Station n�%s : %s channels' % (str(i), str(channels))
             #print station
             for channel_id in range(0,channels):
                 #print channel_id
@@ -91,7 +91,7 @@ class DFuzz:
 
 
 class Channel(Thread):
-    """A channel shout thread"""
+    """A channel shouting thread"""
 
     def __init__(self, station, channel_id):
         Thread.__init__(self)
@@ -238,7 +238,7 @@ class Channel(Thread):
 
 
 class DFuzzError:
-
+    """The D-Fuzz main error class"""
     def __init__(self, message, command, subprocess):
         self.message = message
         self.command = str(command)