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
845242e6
Commit
845242e6
authored
Mar 13, 2020
by
Jean-Baptiste Mardelle
Browse files
Revert set zone out to include current frame
parent
8a847684
Pipeline
#16417
passed with stage
in 22 minutes and 16 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/monitor/monitor.cpp
View file @
845242e6
...
...
@@ -682,13 +682,9 @@ void Monitor::slotSetZoneStart()
checkOverlay
();
}
void
Monitor
::
slotSetZoneEnd
(
bool
discardLastFrame
)
void
Monitor
::
slotSetZoneEnd
()
{
Q_UNUSED
(
discardLastFrame
);
int
pos
=
m_glMonitor
->
getCurrentPos
();
if
(
m_controller
)
{
pos
++
;
}
int
pos
=
m_glMonitor
->
getCurrentPos
()
+
1
;
m_glMonitor
->
getControllerProxy
()
->
setZoneOut
(
pos
);
if
(
m_controller
)
{
m_controller
->
setZone
(
m_glMonitor
->
getControllerProxy
()
->
zone
());
...
...
src/monitor/monitor.h
View file @
845242e6
...
...
@@ -297,7 +297,7 @@ public slots:
void
slotStart
();
void
slotEnd
();
void
slotSetZoneStart
();
void
slotSetZoneEnd
(
bool
discardLastFrame
=
false
);
void
slotSetZoneEnd
();
void
slotZoneStart
();
void
slotZoneEnd
();
void
slotLoadClipZone
(
const
QPoint
&
zone
);
...
...
src/monitor/monitormanager.cpp
View file @
845242e6
...
...
@@ -578,9 +578,6 @@ void MonitorManager::slotSetOutPoint()
if
(
m_activeMonitor
==
m_clipMonitor
)
{
m_clipMonitor
->
slotSetZoneEnd
();
}
else
if
(
m_activeMonitor
==
m_projectMonitor
)
{
// NOT anymore: Zone end behaves slightly differently in clip monitor and timeline monitor.
// in timeline, set zone end selects the frame before current cursor, but in clip monitor
// it selects frame at current cursor position.
m_projectMonitor
->
slotSetZoneEnd
();
}
}
...
...
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