different player buffer for stream-m and icecast server types

diff --git a/README.rst b/README.rst
index 0d1fdb27cd46867f331b1f19ce07f7c5a30438a7..2f7b86cb742257c4cc00d65daa12bb4db90926f1 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -70,8 +70,9 @@ DeeFuzzer has now only been well tested on Linux, but should work on any other p
 You would then need to install libshout3 and liblo libraries for it. On Windows,
 an install inside Gygwin should work well.
 
-IMPORTANT: Please first install libshout3 and liblo from source OR libshout3-dev,
-liblo-dev, gnutls-dev and librtmp-dev from your own distribution package manager.
+To install it, say on Debian, do::
+
+    sudo apt-get install python-pip liblo-dev libshout3-dev gnutls-dev librtmp-dev
 
 Now, the easiest way to install the DeeFuzzer from a shell::
 

diff --git a/deefuzzer/station.py b/deefuzzer/station.py
index 8dd7f1d9352dd93f9f7ef9917ede804ffbd6a917..42b646f95cfa02d86c7fe329b99e4452178e8e93 100644 (file)
--- a/deefuzzer/station.py
+++ b/deefuzzer/station.py
@@ -144,7 +144,7 @@ class Station(Thread):
             os.makedirs(self.metadata_dir)
 
         # The station's player
-        self.player = Player()
+        self.player = Player(self.type)
         self.player_mode = 0
 
         # OSCing

diff --git a/deefuzzer/tools/player.py b/deefuzzer/tools/player.py
index 421b7e28108faaa0c95eb918fdb8d319ea424661..244336e4212cd7130f7101b408672fdfafe9b199 100644 (file)
--- a/deefuzzer/tools/player.py
+++ b/deefuzzer/tools/player.py
@@ -41,11 +41,15 @@ from relay import *
 class Player:
     """A file streaming iterator"""
 
-    def __init__(self):
+    def __init__(self, type='mp3'):
         self.main_buffer_size = 0x100000
-        self.relay_queue_size = 0x100000
-        self.sub_buffer_size = 0x10000
-
+        if type == 'icecast':
+            self.relay_queue_size = 0x100000
+            self.sub_buffer_size = 0x10000
+        if type == 'stream-m':
+            self.relay_queue_size = 0x10000
+            self.sub_buffer_size = 0x20000
+        
     def set_media(self, media):
         self.media = media