jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Move Simple Mode encoder preset out of Advanced

Browse Source
This commit is contained in:
gxalpha 2022-06-25 19:24:04 +02:00 committed by Jim
parent b2895496c7
commit cc5e5cbb94
3 changed files with 16 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/data/locale/en-US.ini
View File

@ -909,7 +909,7 @@ Basic.Settings.Output.AudioBitrate="Audio Bitrate"
Basic.Settings.Output.Reconnect="Automatically Reconnect"
Basic.Settings.Output.RetryDelay="Retry Delay"
Basic.Settings.Output.MaxRetries="Maximum Retries"
Basic.Settings.Output.Advanced="Enable Advanced Encoder Settings"
Basic.Settings.Output.Advanced="Enable Custom Encoder Settings (Advanced)"
Basic.Settings.Output.EncoderPreset="Encoder Preset"
Basic.Settings.Output.CustomEncoderSettings="Custom Encoder Settings"
Basic.Settings.Output.CustomMuxerSettings="Custom Muxer Settings"

58
UI/forms/OBSBasicSettings.ui
View File

@ -1609,17 +1609,7 @@
<item row="2" column="1">
<widget class="QComboBox" name="simpleOutStrEncoder"/>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="simpleOutAdvanced">
<property name="text">
<string>Basic.Settings.Output.Advanced</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<item row="3" column="0">
<widget class="QLabel" name="label_24">
<property name="enabled">
<bool>true</bool>
@ -1632,9 +1622,19 @@
</property>
</widget>
</item>
<item row="4" column="1">
<item row="3" column="1">
<widget class="QComboBox" name="simpleOutPreset"/>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="simpleOutAdvanced">
<property name="text">
<string>Basic.Settings.Output.Advanced</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_23">
<property name="text">
@ -5850,8 +5850,8 @@
<tabstop>simpleOutputVBitrate</tabstop>
<tabstop>simpleOutputABitrate</tabstop>
<tabstop>simpleOutStrEncoder</tabstop>
<tabstop>simpleOutAdvanced</tabstop>
<tabstop>simpleOutPreset</tabstop>
<tabstop>simpleOutAdvanced</tabstop>
<tabstop>simpleOutCustom</tabstop>
<tabstop>simpleOutputPath</tabstop>
<tabstop>simpleOutputBrowse</tabstop>
@ -6038,38 +6038,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>simpleOutAdvanced</sender>
<signal>toggled(bool)</signal>
<receiver>simpleOutPreset</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>251</x>
<y>64</y>
</hint>
<hint type="destinationlabel">
<x>251</x>
<y>64</y>
</hint>
</hints>
</connection>
<connection>
<sender>simpleOutAdvanced</sender>
<signal>toggled(bool)</signal>
<receiver>label_24</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>251</x>
<y>64</y>
</hint>
<hint type="destinationlabel">
<x>251</x>
<y>64</y>
</hint>
</hints>
</connection>
<connection>
<sender>simpleOutAdvanced</sender>
<signal>toggled(bool)</signal>

5
UI/window-basic-main-outputs.cpp
View File

@ -547,14 +547,13 @@ void SimpleOutput::Update()
}
preset = config_get_string(main->Config(), "SimpleOutput", presetType);
obs_data_set_string(videoSettings, "preset", preset);
obs_data_set_string(videoSettings, "rate_control", "CBR");
obs_data_set_int(videoSettings, "bitrate", videoBitrate);
if (advanced) {
obs_data_set_string(videoSettings, "preset", preset);
if (advanced)
obs_data_set_string(videoSettings, "x264opts", custom);
}
obs_data_set_string(aacSettings, "rate_control", "CBR");
obs_data_set_int(aacSettings, "bitrate", audioBitrate);