Skip to content

UI: Enable multiple audio tracks in Simple Output recording #6799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RytoEX merged 2 commits into from
Mar 26, 2023
Merged

UI: Enable multiple audio tracks in Simple Output recording #6799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a884d2
UI: Enable multiple audio tracks in Simple Output recording
pkviet Jul 22, 2022
c5173d1
UI: Move tracks in Advanced Standard Recording
pkviet Mar 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions UI/data/locale/en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,7 @@ Basic.Settings.Output.Simple.Codec.AAC="AAC"
Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (Default)"
Basic.Settings.Output.Simple.Codec.Opus="Opus"
Basic.Settings.Output.Simple.TwitchVodTrack="Twitch VOD Track (Uses Track 2)"
Basic.Settings.Output.Simple.RecAudioTrack="Audio Track"
Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Incompatible Resolution/Framerate"
Basic.Settings.Output.Warn.EnforceResolutionFPS.Msg="This streaming service does not support your current output resolution and/or framerate. They will be changed to the closest compatible value:\n\n%1\n\nDo you want to continue?"
Basic.Settings.Output.Warn.EnforceResolutionFPS.Resolution="Resolution: %1"
Expand Down
231 changes: 224 additions & 7 deletions UI/forms/OBSBasicSettings.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1939,6 +1939,217 @@
<widget class="QComboBox" name="simpleOutRecAEncoder"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="simplerectrack_label">
<property name="text">
<string>Basic.Settings.Output.Simple.RecAudioTrack</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QStackedWidget" name="simpleRecTrackWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="simpleRecTracks">
<layout class="QHBoxLayout" name="horizontalLayoutSimpleTracks">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="simpleOutRecTrack1">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string notr="true">1</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="simpleOutRecTrack2">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string notr="true">2</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="simpleOutRecTrack3">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string notr="true">3</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="simpleOutRecTrack4">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string notr="true">4</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="simpleOutRecTrack5">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string notr="true">5</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="simpleOutRecTrack6">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string notr="true">6</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="simpleFlvTracks">
<layout class="QHBoxLayout" name="horizontalLayoutSimpleFLVTracks">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QRadioButton" name="simpleFlvTrack1">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>1</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="simpleFlvTrack2">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>2</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="simpleFlvTrack3">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>3</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="simpleFlvTrack4">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>4</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="simpleFlvTrack5">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>5</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="simpleFlvTrack6">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>6</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_420">
<property name="text">
<string>Basic.Settings.Output.CustomMuxerSettings</string>
Expand All @@ -1948,10 +2159,10 @@
</property>
</widget>
</item>
<item row="6" column="1">
<item row="7" column="1">
<widget class="QLineEdit" name="simpleOutMuxCustom"/>
</item>
<item row="7" column="1">
<item row="8" column="1">
<widget class="QCheckBox" name="simpleReplayBuf">
<property name="text">
<string>Basic.Settings.Output.UseReplayBuffer</string>
Expand Down Expand Up @@ -2684,14 +2895,14 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_29">
<property name="text">
<string>Basic.Settings.Output.Adv.AudioTrack</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="5" column="1">
<widget class="QStackedWidget" name="advRecTrackWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
Expand Down Expand Up @@ -2892,7 +3103,7 @@
</widget>
</widget>
</item>
<item row="4" column="0">
<item row="4" column="0">
<widget class="QLabel" name="advOutRecAEncLabel">
<property name="text">
<string>Basic.Settings.Output.Encoder.Audio</string>
Expand All @@ -2909,14 +3120,14 @@
</property>
</widget>
</item>
<item row="5" column="0">
<item row="3" column="0">
<widget class="QLabel" name="advOutRecEncLabel">
<property name="text">
<string>Basic.Settings.Output.Encoder.Video</string>
</property>
</widget>
</item>
<item row="5" column="1">
<item row="3" column="1">
<widget class="QComboBox" name="advOutRecEncoder">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
Expand Down Expand Up @@ -7621,6 +7832,12 @@
<tabstop>simpleOutPreset</tabstop>
<tabstop>simpleOutAdvanced</tabstop>
<tabstop>simpleOutCustom</tabstop>
<tabstop>simpleOutRecTrack1</tabstop>
<tabstop>simpleOutRecTrack2</tabstop>
<tabstop>simpleOutRecTrack3</tabstop>
<tabstop>simpleOutRecTrack4</tabstop>
<tabstop>simpleOutRecTrack5</tabstop>
<tabstop>simpleOutRecTrack6</tabstop>
<tabstop>simpleOutputPath</tabstop>
<tabstop>simpleOutputBrowse</tabstop>
<tabstop>simpleNoSpace</tabstop>
Expand Down
Loading