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

UI: Remove cbr/bufsize from simple output mode

Browse Source 
CBR is now always on by default for streaming, so there's no reason to
have a setting for this in particular.  Still available in advanced
output settings of course, but simple output mode really should be kept
as simple as possible.
This commit is contained in:
jp9000
2015-09-11 08:39:38 -07:00
parent 6b4d267682
commit b574407c74
6 changed files with 11 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
obs/forms/OBSBasicSettings.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>895</width>
<height>614</height>
<width>937</width>
<height>653</height>
</rect>
</property>
<property name="sizePolicy">
@@ -565,17 +565,7 @@
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="simpleOutUseCBR">
<property name="text">
<string>Basic.Settings.Output.UseCBR</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_24">
<property name="enabled">
<bool>true</bool>
@@ -585,7 +575,7 @@
</property>
</widget>
</item>
<item row="6" column="1">
<item row="5" column="1">
<widget class="QComboBox" name="simpleOutPreset">
<item>
<property name="text">
@@ -629,46 +619,14 @@
</item>
</widget>
</item>
<item row="7" column="0">
<widget class="QCheckBox" name="simpleOutUseBufsize">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
<string>Basic.Settings.Output.UseBufferSize</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QSpinBox" name="simpleOutVBufsize">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>1000000</number>
</property>
<property name="value">
<number>2000</number>
</property>
</widget>
</item>
<item row="8" column="0">
<item row="6" column="0">
<widget class="QLabel" name="label_23">
<property name="text">
<string>Basic.Settings.Output.CustomEncoderSettings</string>
</property>
</widget>
</item>
<item row="8" column="1">
<item row="6" column="1">
<widget class="QLineEdit" name="simpleOutCustom"/>
</item>
</layout>
@@ -2170,8 +2128,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>67</width>
<height>16</height>
<width>98</width>
<height>28</height>
</rect>
</property>
</widget>
@@ -2558,8 +2516,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>428</width>
<height>287</height>
<width>711</width>
<height>566</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_16">
@@ -3022,70 +2980,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>simpleOutAdvanced</sender>
<signal>toggled(bool)</signal>
<receiver>simpleOutUseCBR</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>871</x>
<y>360</y>
</hint>
<hint type="destinationlabel">
<x>875</x>
<y>392</y>
</hint>
</hints>
</connection>
<connection>
<sender>simpleOutUseBufsize</sender>
<signal>toggled(bool)</signal>
<receiver>simpleOutVBufsize</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>466</x>
<y>464</y>
</hint>
<hint type="destinationlabel">
<x>875</x>
<y>464</y>
</hint>
</hints>
</connection>
<connection>
<sender>simpleOutAdvanced</sender>
<signal>toggled(bool)</signal>
<receiver>simpleOutUseBufsize</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>875</x>
<y>360</y>
</hint>
<hint type="destinationlabel">
<x>457</x>
<y>464</y>
</hint>
</hints>
</connection>
<connection>
<sender>simpleOutAdvanced</sender>
<signal>toggled(bool)</signal>
<receiver>simpleOutVBufsize</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>875</x>
<y>360</y>
</hint>
<hint type="destinationlabel">
<x>875</x>
<y>464</y>
</hint>
</hints>
</connection>
<connection>
<sender>advOutRecType</sender>
<signal>currentIndexChanged(int)</signal>