From 59bbf47bbd67d3a6774f4093f41edc60c5eec9c2 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 7 Nov 2012 16:40:13 +0100 Subject: [PATCH] different player buffer for stream-m and icecast server types --- README.rst | 5 +++-- deefuzzer/station.py | 2 +- deefuzzer/tools/player.py | 12 ++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 0d1fdb2..2f7b86c 100644 --- 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 8dd7f1d..42b646f 100644 --- 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 421b7e2..244336e 100644 --- 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 -- 2.39.5