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
55055a43
Commit
55055a43
authored
Jan 06, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix timeline seeking not reflected on effect stack.
Related to
#159
parent
eae996db
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/monitor/glwidget.h
View file @
55055a43
...
...
@@ -182,7 +182,6 @@ signals:
void
lockMonitor
(
bool
);
void
passKeyEvent
(
QKeyEvent
*
);
void
panView
(
const
QPoint
&
diff
);
void
consumerPosition
(
int
);
void
activateMonitor
();
protected:
...
...
src/monitor/monitor.cpp
View file @
55055a43
...
...
@@ -159,7 +159,6 @@ Monitor::Monitor(Kdenlive::MonitorId id, MonitorManager *manager, QWidget *paren
connect
(
m_glMonitor
,
&
GLWidget
::
passKeyEvent
,
this
,
&
Monitor
::
doKeyPressEvent
);
connect
(
m_glMonitor
,
&
GLWidget
::
panView
,
this
,
&
Monitor
::
panView
);
connect
(
m_glMonitor
->
getControllerProxy
(),
&
MonitorProxy
::
requestSeek
,
this
,
&
Monitor
::
processSeek
,
Qt
::
DirectConnection
);
connect
(
m_glMonitor
,
&
GLWidget
::
consumerPosition
,
this
,
&
Monitor
::
seekPosition
,
Qt
::
DirectConnection
);
connect
(
m_glMonitor
->
getControllerProxy
(),
&
MonitorProxy
::
positionChanged
,
this
,
&
Monitor
::
slotSeekPosition
);
connect
(
m_glMonitor
,
&
GLWidget
::
activateMonitor
,
this
,
&
AbstractMonitor
::
slotActivateMonitor
,
Qt
::
DirectConnection
);
m_videoWidget
=
QWidget
::
createWindowContainer
(
qobject_cast
<
QWindow
*>
(
m_glMonitor
));
...
...
@@ -2067,6 +2066,7 @@ void Monitor::reconfigure()
void
Monitor
::
slotSeekPosition
(
int
pos
)
{
emit
seekPosition
(
pos
);
m_timePos
->
setValue
(
pos
);
checkOverlay
();
}
...
...
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