diff options
| author | MaZderMind <github@mazdermind.de> | 2015-05-14 13:15:52 +0200 |
|---|---|---|
| committer | MaZderMind <github@mazdermind.de> | 2015-05-14 13:15:52 +0200 |
| commit | 421ae902167ec993afe5b0c54909e22c245dfe6a (patch) | |
| tree | b284c8c3534017fc2796f272bec9b616009b4056 /voctocore/lib/videomix.py | |
| parent | c4bf8ce0adc72596db66528aa2f1fc573186fefc (diff) | |
Re-Enable Video-Mixing capabilities and implement dummy Audio-Mixer
Diffstat (limited to 'voctocore/lib/videomix.py')
| -rw-r--r-- | voctocore/lib/videomix.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/voctocore/lib/videomix.py b/voctocore/lib/videomix.py index bcac7d2..dbebede 100644 --- a/voctocore/lib/videomix.py +++ b/voctocore/lib/videomix.py @@ -24,13 +24,14 @@ class VideoMix(object): def __init__(self): self.caps = Config.get('mix', 'videocaps') - self.names = Config.getlist('sources', 'video') + self.names = Config.getlist('mix', 'sources') self.log.info('Configuring Mixer for %u Sources', len(self.names)) pipeline = """ videomixer name=mix ! {caps} ! - textoverlay text=mixer halignment=left valignment=top ypad=175 ! + textoverlay halignment=left valignment=top ypad=175 text=VideoMix ! + timeoverlay halignment=left valignment=top ypad=175 xpad=400 ! intervideosink channel=video_mix """.format( caps=self.caps @@ -55,7 +56,7 @@ class VideoMix(object): self.log.debug('Initializing Mixer-State') self.updateMixerState() - self.log.debug('Launching Mixing-Pipeline:\n%s', pipeline) + self.log.debug('Launching Mixing-Pipeline') self.mixingPipeline.set_state(Gst.State.PLAYING) def updateMixerState(self): |