Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
70bd964f
Commit
70bd964f
authored
Sep 04, 2021
by
Julius Künzel
⚠
Browse files
Stop trimming mode (internal) only if it is running
Fixes playback stoping on selection change and maybe others
parent
a06cefed
Pipeline
#78417
canceled with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/monitor/monitor.cpp
View file @
70bd964f
...
...
@@ -2431,7 +2431,6 @@ void Monitor::processSeek(int pos, bool noAudioScrub)
if
(
KdenliveSettings
::
pauseonseek
())
{
pause
();
}
//noAudioScrub = noAudioScrub || pCore->window()->getCurrentTimeline()->controller()->trimmingActive();
m_glMonitor
->
requestSeek
(
pos
,
noAudioScrub
);
emit
m_monitorManager
->
cleanMixer
();
}
...
...
src/timeline2/view/timelinecontroller.cpp
View file @
70bd964f
...
...
@@ -2183,8 +2183,10 @@ bool TimelineController::requestStartTrimmingMode(int mainClipId, bool onlyCurre
}
void
TimelineController
::
requestEndTrimmingMode
()
{
pCore
->
monitorManager
()
->
projectMonitor
()
->
setProducer
(
pCore
->
window
()
->
getCurrentTimeline
()
->
model
()
->
producer
(),
0
);
pCore
->
monitorManager
()
->
projectMonitor
()
->
slotSwitchTrimming
(
false
);
if
(
pCore
->
monitorManager
()
->
isTrimming
())
{
pCore
->
monitorManager
()
->
projectMonitor
()
->
setProducer
(
pCore
->
window
()
->
getCurrentTimeline
()
->
model
()
->
producer
(),
0
);
pCore
->
monitorManager
()
->
projectMonitor
()
->
slotSwitchTrimming
(
false
);
}
}
void
TimelineController
::
addPreviewRange
(
bool
add
)
...
...
Write
Preview
Supports
Markdown
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