diff options
| author | MaZderMind <git@mazdermind.de> | 2016-11-07 21:28:52 +0100 |
|---|---|---|
| committer | MaZderMind <git@mazdermind.de> | 2016-11-07 21:28:52 +0100 |
| commit | d8f80a7ebbf5a654b8c2591e8240479a4d2797e0 (patch) | |
| tree | b4cb3da040871108d80182f88a28ead7c8948d0f /voctocore | |
| parent | b61cd88f8085c2154534bf540a50e8e18542a322 (diff) | |
| parent | 197e6d8244af1132441f7bba4a904c205a8d4d63 (diff) | |
Merge commit '197e6d8244af1132441f7bba4a904c205a8d4d63'
repair missing merge from force-push to github
Diffstat (limited to 'voctocore')
| -rw-r--r-- | voctocore/default-config.ini | 3 | ||||
| -rw-r--r-- | voctocore/lib/audiomix.py | 4 | ||||
| -rw-r--r-- | voctocore/lib/pipeline.py | 8 | ||||
| -rw-r--r-- | voctocore/lib/videomix.py | 4 |
4 files changed, 14 insertions, 5 deletions
diff --git a/voctocore/default-config.ini b/voctocore/default-config.ini index 4c85abb..168e3e8 100644 --- a/voctocore/default-config.ini +++ b/voctocore/default-config.ini @@ -5,6 +5,9 @@ audiocaps=audio/x-raw,format=S16LE,channels=2,layout=interleaved,rate=48000 ; tcp-ports will be 10000,10001,10002 sources=cam1,cam2,grabber +; set the initial audio source +audiosource=cam1 + [output-buffers] ; voctocore has a buffer on all video-outputs, that store video-frames for your diff --git a/voctocore/lib/audiomix.py b/voctocore/lib/audiomix.py index 37376fd..f35dd0c 100644 --- a/voctocore/lib/audiomix.py +++ b/voctocore/lib/audiomix.py @@ -8,10 +8,10 @@ from lib.clock import Clock class AudioMix(object): - def __init__(self): + def __init__(self, source=0): self.log = logging.getLogger('AudioMix') - self.selectedSource = 0 + self.selectedSource = source self.caps = Config.get('mix', 'audiocaps') self.names = Config.getlist('mix', 'sources') 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) diff --git a/voctocore/lib/videomix.py b/voctocore/lib/videomix.py index 4ab740f..38432e8 100644 --- a/voctocore/lib/videomix.py +++ b/voctocore/lib/videomix.py @@ -222,14 +222,14 @@ class VideoMix(object): try: apos = [int(i) for i in Config.get('side-by-side-preview', 'apos').split('/', 1)] - self.log.debug('B-Video-Position configured to %u/%u', + self.log.debug('A-Video-Position configured to %u/%u', apos[0], apos[1]) except: apos = [ int(width / 100), # 1% int(width / 100) # 1% ] - self.log.debug('B-Video-Position calculated to %u/%u', + self.log.debug('A-Video-Position calculated to %u/%u', apos[0], apos[1]) try: |