From: yomguy <yomguy@parisson.com>
Date: Wed, 7 Nov 2012 15:41:45 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=513bc6e07c58447c84ecc76ec0abcf1934e3bd15;p=deefuzzer.git

Merge branch 'dev'

Conflicts:
	deefuzzer/tools/player.py
---

513bc6e07c58447c84ecc76ec0abcf1934e3bd15
diff --cc deefuzzer/tools/player.py
index 629083e,244336e..7dd2be6
--- a/deefuzzer/tools/player.py
+++ b/deefuzzer/tools/player.py
@@@ -41,11 -41,15 +41,15 @@@ from relay import 
  class Player:
      """A file streaming iterator"""
  
-     def __init__(self):
 -    def __init__(self, type='mp3'):
++    def __init__(self, type='icecast'):
          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