add read mode for webm streaming (need rec now..)

diff --git a/deefuzzer/station.py b/deefuzzer/station.py
index 1dedd1949e7c3cbbf0b394f22c7b789249e27a84..144a578ddd34a150f9037afc09b5902084325f2c 100644 (file)
--- a/deefuzzer/station.py
+++ b/deefuzzer/station.py
@@ -500,6 +500,9 @@ class Station(Thread):
         elif self.player_mode == 1:
             self.stream = self.player.file_read_fast()
 
+    def set_webm_read_mode(self):
+        self.channel.set_callback(FileReader(self.media).read_callback)
+
     def update_twitter_current(self):
         artist_names = self.artist.split(' ')
         artist_tags = ' #'.join(list(set(artist_names)-set(['&', '-'])))
@@ -539,6 +542,9 @@ class Station(Thread):
             self.q.get(1)
             if self.relay_mode:
                 self.set_relay_mode()
+            else:
+                self.media = self.get_next_media()
+                self.set_webm_read_mode()
             self.channel_open()
             self.channel.start()
             self.q.task_done()

diff --git a/deefuzzer/tools/player.py b/deefuzzer/tools/player.py
index 99de24c98cad943bf65b84aaf1fd12e20038030e..0814babfa770021d3ceb625ea0b5bc756eca5eb3 100644 (file)
--- a/deefuzzer/tools/player.py
+++ b/deefuzzer/tools/player.py
@@ -104,7 +104,7 @@ class Player:
 
 class FileReader:
     def __init__(self, fp):
-        self.fp = fp
+        self.fp = open(fp, 'r')
 
     def read_callback(self, size):
         return self.fp.read(size)