Merge commit '197e6d8244af1132441f7bba4a904c205a8d4d63'

repair missing merge from force-push to github

1 files changed, 7 insertions, 1 deletions

diff --git a/voctocore/lib/pipeline.py b/voctocore/lib/pipeline.py
index 1a1349e..6213ac6 100644
--- a/voctocore/lib/pipeline.py
+++ b/voctocore/lib/pipeline.py
@@ -60,8 +60,14 @@ class Pipeline(object):
         self.log.info('Creating Videmixer')
         self.vmix = VideoMix()
 
+        # check if there is an audio source preconfigured
+        try:
+            audiosource = names.index(Config.get('mix', 'audiosource'))
+        except:
+            audiosource = 0
+
         self.log.info('Creating Audiomixer')
-        self.amix = AudioMix()
+        self.amix = AudioMix(audiosource)
 
         port = 16000
         self.log.info('Creating Mixer-Background VSource at tcp-port %u', port)