Commit 6222c0cf authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Merge branch 'atericparker/kdenlive-master'

Fixes !220
parents e5776050 eef41b4d
Pipeline #64323 passed with stage
in 8 minutes and 14 seconds
......@@ -400,6 +400,10 @@
<label>Use Movit for GPU accelerated display and effects.</label>
<default>false</default>
</entry>
<entry name="audio_scrub" type="Bool">
<label>Enable Audio Scrubbing</label>
<default>true</default>
</entry>
<entry name="sdlAudioBackend" type="String">
<label>Detected audio backed.</label>
<default>sdl2_audio</default>
......
......@@ -653,7 +653,11 @@ bool GLWidget::isReady() const
void GLWidget::requestSeek(int position)
{
m_consumer->set("scrub_audio", 1);
if(KdenliveSettings::audio_scrub()){
m_consumer->set("scrub_audio", 1);
} else {
m_consumer->set("scrub_audio", 0);
}
m_producer->seek(position);
if (!qFuzzyIsNull(m_producer->get_speed())) {
m_consumer->purge();
......@@ -1205,7 +1209,11 @@ int GLWidget::reconfigure()
m_consumer->set("buffer", qMax(25, fps));
m_consumer->set("prefill", qMax(1, fps / 25));
m_consumer->set("drop_max", fps / 4);
m_consumer->set("scrub_audio", 1);
if (KdenliveSettings::audio_scrub()) {
m_consumer->set("scrub_audio", 1);
} else {
m_consumer->set("scrub_audio", 0);
}
if (KdenliveSettings::monitor_gamma() == 0) {
m_consumer->set("color_trc", "iec61966_2_1");
} else {
......@@ -1635,7 +1643,7 @@ void GLWidget::switchPlay(bool play, int offset, double speed)
m_proxy->setSpeed(speed);
if (qFuzzyCompare(speed, 1.0) || speed < -6. || speed > 6.) {
m_consumer->set("scrub_audio", 0);
} else {
} else if (KdenliveSettings::audio_scrub()){
m_consumer->set("scrub_audio", 1);
}
if (qFuzzyIsNull(current_speed)) {
......
......@@ -28,14 +28,21 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<item row="2" column="0" colspan="6">
<widget class="QCheckBox" name="kcfg_audio_scrub">
<property name="text">
<string>Enable Audio Scrubbing</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Audio backend</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="6">
<item row="4" column="0" colspan="6">
<widget class="QGroupBox" name="group_sdl">
<property name="title">
<string/>
......@@ -76,14 +83,14 @@
</layout>
</widget>
</item>
<item row="4" column="0" colspan="2">
<item row="5" column="0" colspan="2">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Preview volume:</string>
</property>
</widget>
</item>
<item row="4" column="3">
<item row="5" column="3">
<widget class="QSpinBox" name="kcfg_volume">
<property name="suffix">
<string>%</string>
......@@ -96,14 +103,14 @@
</property>
</widget>
</item>
<item row="5" column="0" colspan="3">
<item row="6" column="0" colspan="3">
<widget class="QLabel" name="label">
<property name="text">
<string>Monitor background color:</string>
</property>
</widget>
</item>
<item row="5" column="3" colspan="3">
<item row="6" column="3" colspan="3">
<widget class="KColorButton" name="kcfg_window_background">
<property name="defaultColor" stdset="0">
<color>
......@@ -114,28 +121,28 @@
</property>
</widget>
</item>
<item row="6" column="0" colspan="6">
<item row="7" column="0" colspan="6">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="7" column="0" colspan="4">
<item row="8" column="0" colspan="4">
<widget class="QCheckBox" name="kcfg_external_display">
<property name="text">
<string>Use external display (Blackmagic card)</string>
</property>
</widget>
</item>
<item row="8" column="0">
<item row="9" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Output device</string>
</property>
</widget>
</item>
<item row="8" column="1" colspan="4">
<item row="9" column="1" colspan="4">
<widget class="QComboBox" name="kcfg_blackmagic_output_device">
<property name="enabled">
<bool>true</bool>
......@@ -148,14 +155,14 @@
</property>
</widget>
</item>
<item row="8" column="5">
<item row="9" column="5">
<widget class="QToolButton" name="reload_blackmagic">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="9" column="4">
<item row="10" column="4">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment