From 7debf8ff0b45dba789eda13a9835095fbe82c98e Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 11 Jan 2012 15:24:28 +0100 Subject: [PATCH] add read mode for webm streaming (need rec now..) --- deefuzzer/station.py | 6 ++++++ deefuzzer/tools/player.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/deefuzzer/station.py b/deefuzzer/station.py index 1dedd19..144a578 100644 --- 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 99de24c..0814bab 100644 --- 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) -- 2.39.5