Commit ebaf8d94 authored by Juku Trump's avatar Juku Trump Committed by Jean-Baptiste Mardelle

Add option to not pause the playback while seeking

parent ec0ff97c
...@@ -1101,6 +1101,10 @@ void KdenliveSettingsDialog::updateSettings() ...@@ -1101,6 +1101,10 @@ void KdenliveSettingsDialog::updateSettings()
emit pCore->autoScrollChanged(); emit pCore->autoScrollChanged();
} }
if (m_configTimeline.kcfg_pauseonseek->isChecked() != KdenliveSettings::pauseonseek()) {
KdenliveSettings::setPauseonseek(m_configTimeline.kcfg_pauseonseek->isChecked());
}
// Mimes // Mimes
if (m_configEnv.kcfg_addedExtensions->text() != KdenliveSettings::addedExtensions()) { if (m_configEnv.kcfg_addedExtensions->text() != KdenliveSettings::addedExtensions()) {
// Update list // Update list
......
...@@ -322,6 +322,11 @@ ...@@ -322,6 +322,11 @@
<default>true</default> <default>true</default>
</entry> </entry>
<entry name="pauseonseek" type="Bool">
<label>Pause playback when seeking.</label>
<default>true</default>
</entry>
<entry name="verticalzoom" type="Bool"> <entry name="verticalzoom" type="Bool">
<label>Vertical drag in timeline ruler zooms.</label> <label>Vertical drag in timeline ruler zooms.</label>
<default>false</default> <default>false</default>
......
...@@ -2301,7 +2301,9 @@ void Monitor::processSeek(int pos) ...@@ -2301,7 +2301,9 @@ void Monitor::processSeek(int pos)
if (!slotActivateMonitor()) { if (!slotActivateMonitor()) {
return; return;
} }
pause(); if (KdenliveSettings::pauseonseek()) {
pause();
}
m_glMonitor->requestSeek(pos); m_glMonitor->requestSeek(pos);
emit m_monitorManager->cleanMixer(); emit m_monitorManager->cleanMixer();
} }
......
...@@ -277,7 +277,7 @@ private slots: ...@@ -277,7 +277,7 @@ private slots:
void slotSeekPosition(int); void slotSeekPosition(int);
void addSnapPoint(int pos); void addSnapPoint(int pos);
void removeSnapPoint(int pos); void removeSnapPoint(int pos);
/** @brief Pause monitor and process seek */ /** @brief Process seek and optionally pause monitor */
void processSeek(int pos); void processSeek(int pos);
/** @brief Check and display dropped frames */ /** @brief Check and display dropped frames */
void checkDrops(); void checkDrops();
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="7" column="0" colspan="4"> <item row="8" column="0" colspan="4">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string>Raise properties pane when selecting in timeline</string> <string>Raise properties pane when selecting in timeline</string>
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="4"> <item row="7" column="0" colspan="4">
<widget class="QGroupBox" name="groupBox_3"> <widget class="QGroupBox" name="groupBox_3">
<property name="title"> <property name="title">
<string>Multi stream audio clips</string> <string>Multi stream audio clips</string>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="4"> <item row="6" column="0" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
...@@ -212,7 +212,14 @@ ...@@ -212,7 +212,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="3"> <item row="4" column="0" colspan="4">
<widget class="QCheckBox" name="kcfg_pauseonseek">
<property name="text">
<string>Pause playback when seeking</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="3">
<widget class="QCheckBox" name="kcfg_verticalzoom"> <widget class="QCheckBox" name="kcfg_verticalzoom">
<property name="text"> <property name="text">
<string>Zoom using vertical drag in ruler</string> <string>Zoom using vertical drag in ruler</string>
......
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