Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
259
Issues
259
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
ebaf8d94
Commit
ebaf8d94
authored
Dec 16, 2020
by
Juku Trump
Committed by
Jean-Baptiste Mardelle
Jan 03, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add option to not pause the playback while seeking
parent
ec0ff97c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
6 deletions
+24
-6
src/dialogs/kdenlivesettingsdialog.cpp
src/dialogs/kdenlivesettingsdialog.cpp
+4
-0
src/kdenlivesettings.kcfg
src/kdenlivesettings.kcfg
+5
-0
src/monitor/monitor.cpp
src/monitor/monitor.cpp
+3
-1
src/monitor/monitor.h
src/monitor/monitor.h
+1
-1
src/ui/configtimeline_ui.ui
src/ui/configtimeline_ui.ui
+11
-4
No files found.
src/dialogs/kdenlivesettingsdialog.cpp
View file @
ebaf8d94
...
...
@@ -1101,6 +1101,10 @@ void KdenliveSettingsDialog::updateSettings()
emit
pCore
->
autoScrollChanged
();
}
if
(
m_configTimeline
.
kcfg_pauseonseek
->
isChecked
()
!=
KdenliveSettings
::
pauseonseek
())
{
KdenliveSettings
::
setPauseonseek
(
m_configTimeline
.
kcfg_pauseonseek
->
isChecked
());
}
// Mimes
if
(
m_configEnv
.
kcfg_addedExtensions
->
text
()
!=
KdenliveSettings
::
addedExtensions
())
{
// Update list
...
...
src/kdenlivesettings.kcfg
View file @
ebaf8d94
...
...
@@ -322,6 +322,11 @@
<default>
true
</default>
</entry>
<entry
name=
"pauseonseek"
type=
"Bool"
>
<label>
Pause playback when seeking.
</label>
<default>
true
</default>
</entry>
<entry
name=
"verticalzoom"
type=
"Bool"
>
<label>
Vertical drag in timeline ruler zooms.
</label>
<default>
false
</default>
...
...
src/monitor/monitor.cpp
View file @
ebaf8d94
...
...
@@ -2301,7 +2301,9 @@ void Monitor::processSeek(int pos)
if
(
!
slotActivateMonitor
())
{
return
;
}
pause
();
if
(
KdenliveSettings
::
pauseonseek
())
{
pause
();
}
m_glMonitor
->
requestSeek
(
pos
);
emit
m_monitorManager
->
cleanMixer
();
}
...
...
src/monitor/monitor.h
View file @
ebaf8d94
...
...
@@ -277,7 +277,7 @@ private slots:
void
slotSeekPosition
(
int
);
void
addSnapPoint
(
int
pos
);
void
removeSnapPoint
(
int
pos
);
/** @brief P
ause monitor and process seek
*/
/** @brief P
rocess seek and optionally pause monitor
*/
void
processSeek
(
int
pos
);
/** @brief Check and display dropped frames */
void
checkDrops
();
...
...
src/ui/configtimeline_ui.ui
View file @
ebaf8d94
...
...
@@ -11,7 +11,7 @@
</rect>
</property>
<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"
>
<property
name=
"title"
>
<string>
Raise properties pane when selecting in timeline
</string>
...
...
@@ -113,7 +113,7 @@
</layout>
</widget>
</item>
<item
row=
"
6
"
column=
"0"
colspan=
"4"
>
<item
row=
"
7
"
column=
"0"
colspan=
"4"
>
<widget
class=
"QGroupBox"
name=
"groupBox_3"
>
<property
name=
"title"
>
<string>
Multi stream audio clips
</string>
...
...
@@ -168,7 +168,7 @@
</property>
</widget>
</item>
<item
row=
"
5
"
column=
"0"
colspan=
"4"
>
<item
row=
"
6
"
column=
"0"
colspan=
"4"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_2"
>
<item>
<widget
class=
"QLabel"
name=
"label"
>
...
...
@@ -212,7 +212,14 @@
</property>
</widget>
</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"
>
<property
name=
"text"
>
<string>
Zoom using vertical drag in ruler
</string>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment