Skip to content
GitLab
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
6a068663
Commit
6a068663
authored
Jan 29, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix clip monitor not pausing at clip end, fix play zone activating wrong monitor
parent
40076c8f
Pipeline
#14113
passed with stage
in 14 minutes and 20 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/core.cpp
View file @
6a068663
...
...
@@ -52,6 +52,7 @@ Core::Core()
void
Core
::
prepareShutdown
()
{
m_guiConstructed
=
false
;
m_mainWindow
->
getCurrentTimeline
()
->
controller
()
->
prepareClose
();
projectItemModel
()
->
blockSignals
(
true
);
QThreadPool
::
globalInstance
()
->
clear
();
}
...
...
src/monitor/glwidget.cpp
View file @
6a068663
...
...
@@ -701,7 +701,7 @@ bool GLWidget::checkFrameNumber(int pos, int offset, bool isPlaying)
return
true
;
}
else
if
(
isPlaying
)
{
maxPos
-=
offset
;
if
(
pos
>=
(
maxPos
-
1
)
&&
speed
>
0.
)
{
if
(
pos
>=
(
maxPos
-
1
)
&&
!
(
speed
<
0.
)
)
{
// Playing past last clip, pause
m_producer
->
set_speed
(
0
);
m_consumer
->
set
(
"refresh"
,
0
);
...
...
src/monitor/monitor.cpp
View file @
6a068663
...
...
@@ -266,6 +266,9 @@ Monitor::Monitor(Kdenlive::MonitorId id, MonitorManager *manager, QWidget *paren
auto
*
playButton
=
new
QToolButton
(
m_toolbar
);
m_playMenu
=
new
QMenu
(
i18n
(
"Play..."
),
this
);
connect
(
m_playMenu
,
&
QMenu
::
aboutToShow
,
[
this
]()
{
slotActivateMonitor
();
});
QAction
*
originalPlayAction
=
static_cast
<
KDualAction
*>
(
manager
->
getAction
(
QStringLiteral
(
"monitor_play"
)));
m_playAction
=
new
KDualAction
(
i18n
(
"Play"
),
i18n
(
"Pause"
),
this
);
m_playAction
->
setInactiveIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"media-playback-start"
)));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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