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 /voctogui/lib | |
| parent | b61cd88f8085c2154534bf540a50e8e18542a322 (diff) | |
| parent | 197e6d8244af1132441f7bba4a904c205a8d4d63 (diff) | |
Merge commit '197e6d8244af1132441f7bba4a904c205a8d4d63'
repair missing merge from force-push to github
Diffstat (limited to 'voctogui/lib')
| -rw-r--r-- | voctogui/lib/ui.py | 16 | ||||
| -rw-r--r-- | voctogui/lib/videodisplay.py | 1 |
2 files changed, 11 insertions, 6 deletions
diff --git a/voctogui/lib/ui.py b/voctogui/lib/ui.py index 92d0692..a8fb6a9 100644 --- a/voctogui/lib/ui.py +++ b/voctogui/lib/ui.py @@ -58,12 +58,16 @@ class Ui(UiBuilder): uibuilder=self ) - drawing_area = self.find_widget_recursive(self.win, 'combo_audio') - self.audio_selector_controller = AudioSelectorController( - drawing_area, - win=self.win, - uibuilder=self - ) + # check if there is a fixed audio source configured. + # if so, remove the combo-box entirely instead of setting it up. + if Config.has_option('mix', 'audiosource'): + drawing_area.remove(self.find_widget_recursive(self.win, 'box_audio')) + else: + self.audio_selector_controller = AudioSelectorController( + drawing_area=self.find_widget_recursive(self.win, 'combo_audio'), + win=self.win, + uibuilder=self + ) # Setup Toolbar Controllers toolbar = self.find_widget_recursive(self.win, 'toolbar') diff --git a/voctogui/lib/videodisplay.py b/voctogui/lib/videodisplay.py index 6c225ae..0714f80 100644 --- a/voctogui/lib/videodisplay.py +++ b/voctogui/lib/videodisplay.py @@ -44,6 +44,7 @@ class VideoDisplay(object): else: self.log.info('using raw-video instead of encoded-previews') + vdec = None # Setup Server-Connection, Demuxing and Decoding pipeline = """ |