use rb read / write, remove channel.sync

(fix relay against libshout 2.4.6)

diff --git a/deefuzzer/player.py b/deefuzzer/player.py
index 7705e5443549e73050e9c7674886533af803f5de..cff49d94e8d728366b33ae2fab2b3444e9a4cb67 100644 (file)
--- a/deefuzzer/player.py
+++ b/deefuzzer/player.py
@@ -47,7 +47,6 @@ class Player:
         self.relay.set_url(self.url)
         self.relay.open()
         self.relay.start()
-        self.queue = self.relay.queue
 
     def stop_relay(self):
         self.relay.close()
@@ -86,11 +85,11 @@ class Player:
     def relay_read(self):
         """Read a distant media through its URL"""
         while True:
-            self.sub_chunk = self.queue.get(self.sub_buffer_size)
+            self.sub_chunk = self.relay.queue.get(self.sub_buffer_size)
             if not self.sub_chunk:
                 break
             yield self.sub_chunk
-            self.queue.task_done()
+            self.relay.queue.task_done()
         self.sub_chunk = 0
 
 

diff --git a/deefuzzer/recorder.py b/deefuzzer/recorder.py
index 187e06c3a110d3ed5bc0229de60866efd845a5b5..8e131b7dd3f71c7858ac34c9717b8ca1ff49c0b8 100644 (file)
--- a/deefuzzer/recorder.py
+++ b/deefuzzer/recorder.py
@@ -34,7 +34,7 @@ class Recorder:
 
     def open(self, filename):
         self.filename = filename
-        self.media = open(self.path + os.sep + self.filename, 'w')
+        self.media = open(self.path + os.sep + self.filename, 'wb')
 
     def write(self, chunk):
         try:

diff --git a/deefuzzer/relay.py b/deefuzzer/relay.py
index ab96384acc28836e6616fff9838b11fc9a074cd5..afe69893cbe1628adb925d54f654afba97619b02 100644 (file)
--- a/deefuzzer/relay.py
+++ b/deefuzzer/relay.py
@@ -54,7 +54,7 @@ class Relay(Thread):
             if self.isopen:
                 self.chunk = self.stream.read(self.sub_buffer_size)
                 self.queue.put_nowait(self.chunk)
-#                print self.queue.qsize()
+                # print(self.queue.qsize())
             else:
                 if self.stream:
                     self.stream.close()

diff --git a/deefuzzer/station.py b/deefuzzer/station.py
index be9fea701455d9a2fd2aff4a02a2341a5597a037..a42f4d5cfdc6dc97bf8b2933663178856303fa2a 100644 (file)
--- a/deefuzzer/station.py
+++ b/deefuzzer/station.py
@@ -982,7 +982,6 @@ class Station(Thread):
                         try:
                             # Send the chunk to the stream
                             self.channel.send(self.chunk)
-                            self.channel.sync()
                             self.is_alive = True
                         except:
                             self._err('could not send the buffer')
@@ -997,7 +996,6 @@ class Station(Thread):
                                 self.channel.set_metadata({'song': self.song, 'charset': 'utf8', })
                                 self._info('channel restarted')
                                 self.channel.send(self.chunk)
-                                self.channel.sync()
                                 self.is_alive = True
                             except:
                                 self._err('could not send data after restarting the channel')