diff options
| -rwxr-xr-x | example-scripts/ffmpeg/record-all-audio-streams.py | 8 | ||||
| -rw-r--r-- | voctocore/lib/avpreviewoutput.py | 5 | ||||
| -rw-r--r-- | voctogui/lib/ui.py | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/example-scripts/ffmpeg/record-all-audio-streams.py b/example-scripts/ffmpeg/record-all-audio-streams.py index f2ce526..c30f735 100755 --- a/example-scripts/ffmpeg/record-all-audio-streams.py +++ b/example-scripts/ffmpeg/record-all-audio-streams.py @@ -58,9 +58,13 @@ except: # ffmpeg # -hide_banner # -y -nostdin -# -i tcp://localhost:13000 -i tcp://localhost:13001 -i tcp://localhost:13002 +# -i tcp://localhost:13000 +# -i tcp://localhost:13001 +# -i tcp://localhost:13002 # -ac 2 -channel_layout stereo -# -map 0:a -metadata:s:a:0 language=und -map 1:a -metadata:s:a:1 language=und -map 2:a -metadata:s:a:2 language=und +# -map 0:a -metadata:s:a:0 language=und +# -map 1:a -metadata:s:a:1 language=und +# -map 2:a -metadata:s:a:2 language=und # -c:a mp2 -b:a 192k -ac:a 2 -ar:a 48000 # -flags +global_header -flags +ilme+ildct # -f mpegts diff --git a/voctocore/lib/avpreviewoutput.py b/voctocore/lib/avpreviewoutput.py index 2be4a52..fc46dcc 100644 --- a/voctocore/lib/avpreviewoutput.py +++ b/voctocore/lib/avpreviewoutput.py @@ -98,8 +98,8 @@ class AVPreviewOutput(TCPMultiConnection): struct = caps.get_structure(0) _, width = struct.get_int('width') _, height = struct.get_int('height') - _, framerate_numerator, framerate_denominator = struct.get_fraction('framerate') - + (_, framerate_numerator, + framerate_denominator) = struct.get_fraction('framerate') return ''' capsfilter caps=video/x-raw,interlace-mode=progressive ! @@ -132,7 +132,6 @@ class AVPreviewOutput(TCPMultiConnection): else: pipeline = '' - pipeline += ''' videoscale ! {target_caps} ! diff --git a/voctogui/lib/ui.py b/voctogui/lib/ui.py index a8fb6a9..63f6c33 100644 --- a/voctogui/lib/ui.py +++ b/voctogui/lib/ui.py @@ -61,10 +61,12 @@ class Ui(UiBuilder): # 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')) + box_audio = self.find_widget_recursive(self.win, 'box_audio') + drawing_area.remove(box_audio) else: + combo_audio = self.find_widget_recursive(self.win, 'combo_audio') self.audio_selector_controller = AudioSelectorController( - drawing_area=self.find_widget_recursive(self.win, 'combo_audio'), + drawing_area=combo_audio, win=self.win, uibuilder=self ) |