From 50532858450c0c27f611004e7dc5e57ed2721086 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 14 Apr 2011 16:06:58 +0000 Subject: [PATCH] fix pipelines --- timeside/encoder/flac.py | 8 ++++---- timeside/encoder/ogg.py | 7 +++---- timeside/encoder/wav.py | 9 ++++----- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/timeside/encoder/flac.py b/timeside/encoder/flac.py index 60f6042..66db6b3 100644 --- a/timeside/encoder/flac.py +++ b/timeside/encoder/flac.py @@ -54,10 +54,10 @@ class FlacEncoder(Processor): ! flacenc ''' if self.filename and self.streaming: - self.pipe += ''' - ! tee name=t - ! queue ! appsink name=sink sync=False - t. ! queue ! filesink location=%s ''' % self.filename + self.pipe += ''' ! tee name=t + ! queue ! filesink location=%s + t. ! queue ! appsink name=app sync=False + ''' % self.filename elif self.filename : self.pipe += '! filesink location=%s ' % self.filename diff --git a/timeside/encoder/ogg.py b/timeside/encoder/ogg.py index 3e18ec6..477cf79 100644 --- a/timeside/encoder/ogg.py +++ b/timeside/encoder/ogg.py @@ -57,10 +57,9 @@ class VorbisEncoder(Processor): ! oggmux ''' if self.filename and self.streaming: - self.pipe += ''' - ! tee name=t - ! queue ! appsink name=app sync=False - t. ! queue ! filesink location=%s + self.pipe += ''' ! tee name=t + ! queue ! filesink location=%s + t. ! queue ! appsink name=app sync=False ''' % self.filename elif self.filename : diff --git a/timeside/encoder/wav.py b/timeside/encoder/wav.py index a763ba1..1f458b1 100644 --- a/timeside/encoder/wav.py +++ b/timeside/encoder/wav.py @@ -55,16 +55,15 @@ class WavEncoder(Processor): ! wavenc ''' if self.filename and self.streaming: - self.pipe += ''' - ! tee name=t - t. ! queue ! appsink name=app sync=false - t. ! queue ! filesink sync=false location=%s + self.pipe += ''' ! tee name=t + ! queue ! filesink location=%s + t. ! queue ! appsink name=app sync=False ''' % self.filename elif self.filename : self.pipe += '! filesink location=%s ' % self.filename else: - self.pipe += '! appsink name=app sync=false' + self.pipe += '! appsink name=app sync=False' self.pipeline = gst.parse_launch(self.pipe) # store a pointer to appsrc in our encoder object -- 2.39.5