aboutsummaryrefslogtreecommitdiff
path: root/voctocore/lib
diff options
context:
space:
mode:
authorMaZderMind <peter@mazdermind.de>2014-08-24 17:25:06 +0200
committerMaZderMind <peter@mazdermind.de>2014-08-24 17:25:06 +0200
commitb9e3f1a2733d56c2410fdec0f0864db6ae728d74 (patch)
treef7fada6f62283864058d28670207e668cfe3434c /voctocore/lib
parent90001a38c03e41faeccd0b959753a00db670c61a (diff)
move name-setting to pipeline
Diffstat (limited to 'voctocore/lib')
-rw-r--r--voctocore/lib/pipeline.py2
-rw-r--r--voctocore/lib/shmsrc.py3
2 files changed, 2 insertions, 3 deletions
diff --git a/voctocore/lib/pipeline.py b/voctocore/lib/pipeline.py
index aa9754c..112ac3e 100644
--- a/voctocore/lib/pipeline.py
+++ b/voctocore/lib/pipeline.py
@@ -49,7 +49,7 @@ class Pipeline(Gst.Pipeline):
socket = os.path.join(socketpath, 'v-'+name)
self.log.info('Creating video-source %s at socket-path %s', name, socket)
- sourcebin = FailsafeShmSrc(name, socket)
+ sourcebin = FailsafeShmSrc(socket)
self.add(sourcebin)
self.quadmixer.add_source(sourcebin)
diff --git a/voctocore/lib/shmsrc.py b/voctocore/lib/shmsrc.py
index 53a7d9d..7c80199 100644
--- a/voctocore/lib/shmsrc.py
+++ b/voctocore/lib/shmsrc.py
@@ -9,9 +9,8 @@ class FailsafeShmSrc(Gst.Bin):
last_buffer_arrived = 0
is_in_failstate = True
- def __init__(self, name, socket):
+ def __init__(self, socket):
super().__init__()
- self.set_name(socket)
caps = Gst.Caps.from_string(Config.get('sources', 'videocaps'))
self.log.debug('parsing videocaps from config: %s', caps.to_string())