go back to 0.6.1, fix stream-m url

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 573c8ffce3c0e5ebf83696ca6042f13d6a5c92cc..b7372b845278dae7b76976050ac86ccdfae24ad6 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,11 +1,10 @@
-deefuzzer (0.6.2-1beta) unstable; urgency=low
+deefuzzer (0.6.1-1) unstable; urgency=low
 
 * new HTTP steamer based on pycurl to handle stream-m servers (webm streaming)
+  see http://code.google.com/p/stream-m/
 * live webm relaying works good, webm playlist reading NEED testing
 * new <station><server><type> parameter ('icecast or 'stream-m')
 
 -- Guillaume Pellerin <yomguy@parisson.com>  Thu, 12 Jan 2012 13:22:22 +0100
 
-
 For older changes, please see http://svn.parisson.org/deefuzzer
-

diff --git a/deefuzzer/station.py b/deefuzzer/station.py
index f87c1367e5bb4d9f1a2fba4c2dec33e562ab45d7..e6d541a7beb0c389b827fe75f56f3370289d97d7 100644 (file)
--- a/deefuzzer/station.py
+++ b/deefuzzer/station.py
@@ -77,12 +77,13 @@ class Station(Thread):
 
         # Server
         self.short_name = self.station['infos']['short_name']
-        self.mount = '/' + self.short_name
 
         if 'type' in self.station['server']:
             self.type = self.station['server']['type'] #  'icecast' | 'stream-m'
+            self.mount = '/publish/' + self.short_name
         else:
             self.type = 'icecast'
+            self.mount = '/' + self.short_name
 
         if 'stream-m' in self.type:
             self.channel = HTTPStreamer()