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

Make ffmpeg test output sync A/V properly

Browse Source 
FFmpeg test output wasn't make any attempt to sync data before.  Should
be much more accurate now.

Also, added a restart message to audio settings if base audio settings
are changed.
This commit is contained in:
jp9000
2014-02-24 01:48:14 -07:00
parent 268e4e7811
commit 6c2d067e05
3 changed files with 60 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
obs/forms/OBSBasicSettings.ui
View File

@@ -288,6 +288,19 @@
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLabel" name="audioMsg">
<property name="styleSheet">
<string notr="true">color: rgb(255, 0, 4);</string>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="videoPage">

6
obs/window-basic-settings.cpp
View File

@@ -493,7 +493,7 @@ void OBSBasicSettings::on_sampleRate_currentIndexChanged(int index)
{
if (!loading) {
audioChanged = true;
ui->videoMsg->setText(QTStr("Settings.ProgramRestart"));
ui->audioMsg->setText(QTStr("Settings.ProgramRestart"));
}
UNUSED_PARAMETER(index);
@@ -503,7 +503,7 @@ void OBSBasicSettings::on_channelSetup_currentIndexChanged(int index)
{
if (!loading) {
audioChanged = true;
ui->videoMsg->setText(QTStr("Settings.ProgramRestart"));
ui->audioMsg->setText(QTStr("Settings.ProgramRestart"));
}
UNUSED_PARAMETER(index);
@@ -513,7 +513,7 @@ void OBSBasicSettings::on_audioBufferingTime_valueChanged(int value)
{
if (!loading) {
audioChanged = true;
ui->videoMsg->setText(QTStr("Settings.ProgramRestart"));
ui->audioMsg->setText(QTStr("Settings.ProgramRestart"));
}
UNUSED_PARAMETER(value);