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
261
Issues
261
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
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
75664632
Commit
75664632
authored
Jan 31, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix forward/rewind affecting wrong monitor
BUG: 416917
parent
f74d3dc2
Pipeline
#14270
passed with stage
in 14 minutes and 10 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
19 deletions
+22
-19
src/monitor/abstractmonitor.h
src/monitor/abstractmonitor.h
+2
-0
src/monitor/monitor.cpp
src/monitor/monitor.cpp
+12
-7
src/monitor/monitor.h
src/monitor/monitor.h
+2
-2
src/monitor/monitormanager.cpp
src/monitor/monitormanager.cpp
+6
-10
No files found.
src/monitor/abstractmonitor.h
View file @
75664632
...
...
@@ -87,6 +87,8 @@ public slots:
virtual
void
stop
()
=
0
;
virtual
void
start
()
=
0
;
virtual
void
slotPlay
()
=
0
;
virtual
void
slotRewind
(
double
speed
=
0
)
=
0
;
virtual
void
slotForward
(
double
speed
=
0
)
=
0
;
virtual
void
refreshMonitorIfActive
(
bool
directUpdate
=
false
)
=
0
;
virtual
void
slotMouseSeek
(
int
eventDelta
,
uint
modifiers
)
=
0
;
bool
slotActivateMonitor
();
...
...
src/monitor/monitor.cpp
View file @
75664632
...
...
@@ -262,13 +262,14 @@ Monitor::Monitor(Kdenlive::MonitorId id, MonitorManager *manager, QWidget *paren
manager
->
getAction
(
QStringLiteral
(
"mark_out"
))
->
trigger
();
});
}
m_toolbar
->
addAction
(
manager
->
getAction
(
QStringLiteral
(
"monitor_seek_backward"
)));
// Per monitor rewind action
QAction
*
rewind
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"media-seek-backward"
)),
i18n
(
"Rewind"
),
this
);
m_toolbar
->
addAction
(
rewind
);
connect
(
rewind
,
&
QAction
::
triggered
,
this
,
&
Monitor
::
slotRewind
);
auto
*
playButton
=
new
QToolButton
(
m_toolbar
);
m_playMenu
=
new
QMenu
(
i18n
(
"Play..."
),
this
);
connect
(
m_playMenu
,
&
QMenu
::
aboutToShow
,
[
this
]()
{
slotActivateMonitor
();
});
connect
(
m_playMenu
,
&
QMenu
::
aboutToShow
,
this
,
&
Monitor
::
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"
)));
...
...
@@ -287,7 +288,11 @@ Monitor::Monitor(Kdenlive::MonitorId id, MonitorManager *manager, QWidget *paren
playButton
->
setMenu
(
m_playMenu
);
playButton
->
setPopupMode
(
QToolButton
::
MenuButtonPopup
);
m_toolbar
->
addWidget
(
playButton
);
m_toolbar
->
addAction
(
manager
->
getAction
(
QStringLiteral
(
"monitor_seek_forward"
)));
// Per monitor forward action
QAction
*
forward
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"media-seek-forward"
)),
i18n
(
"Forward"
),
this
);
m_toolbar
->
addAction
(
forward
);
connect
(
forward
,
&
QAction
::
triggered
,
this
,
&
Monitor
::
slotForward
);
playButton
->
setDefaultAction
(
m_playAction
);
m_configMenu
=
new
QMenu
(
i18n
(
"Misc..."
),
this
);
...
...
@@ -1181,8 +1186,8 @@ void Monitor::slotRewind(double speed)
speed
=
currentspeed
*
1.5
;
}
}
m_glMonitor
->
switchPlay
(
true
,
speed
);
m_playAction
->
setActive
(
true
);
m_glMonitor
->
switchPlay
(
true
,
speed
);
}
void
Monitor
::
slotForward
(
double
speed
)
...
...
@@ -1197,8 +1202,8 @@ void Monitor::slotForward(double speed)
speed
=
currentspeed
*
1.2
;
}
}
m_glMonitor
->
switchPlay
(
true
,
speed
);
m_playAction
->
setActive
(
true
);
m_glMonitor
->
switchPlay
(
true
,
speed
);
}
void
Monitor
::
slotRewindOneFrame
(
int
diff
)
...
...
src/monitor/monitor.h
View file @
75664632
...
...
@@ -290,8 +290,8 @@ public slots:
void
slotLoopZone
();
/** @brief Loops the selected item (clip or transition). */
void
slotLoopClip
();
void
slotForward
(
double
speed
=
0
);
void
slotRewind
(
double
speed
=
0
);
void
slotForward
(
double
speed
=
0
)
override
;
void
slotRewind
(
double
speed
=
0
)
override
;
void
slotRewindOneFrame
(
int
diff
=
1
);
void
slotForwardOneFrame
(
int
diff
=
1
);
void
slotStart
();
...
...
src/monitor/monitormanager.cpp
View file @
75664632
...
...
@@ -235,19 +235,15 @@ void MonitorManager::slotLoopZone()
void
MonitorManager
::
slotRewind
(
double
speed
)
{
if
(
m_activeMonitor
==
m_clipMonitor
)
{
m_clipMonitor
->
slotRewind
(
speed
);
}
else
if
(
m_activeMonitor
==
m_projectMonitor
)
{
m_projectMonitor
->
slotRewind
(
speed
);
if
(
m_activeMonitor
)
{
m_activeMonitor
->
slotRewind
(
speed
);
}
}
void
MonitorManager
::
slotForward
(
double
speed
)
{
if
(
m_activeMonitor
==
m_clipMonitor
)
{
m_clipMonitor
->
slotForward
(
speed
);
}
else
if
(
m_activeMonitor
==
m_projectMonitor
)
{
m_projectMonitor
->
slotForward
(
speed
);
if
(
m_activeMonitor
)
{
m_activeMonitor
->
slotForward
(
speed
);
}
}
...
...
@@ -387,7 +383,7 @@ void MonitorManager::setupActions()
pCore
->
window
()
->
addAction
(
QStringLiteral
(
"monitor_zoomout"
),
monitorZoomOut
);
QAction
*
monitorSeekBackward
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"media-seek-backward"
)),
i18n
(
"Rewind"
),
this
);
connect
(
monitorSeekBackward
,
SIGNAL
(
triggered
(
bool
)),
SLOT
(
slotRewind
())
);
connect
(
monitorSeekBackward
,
&
QAction
::
triggered
,
this
,
&
MonitorManager
::
slotRewind
);
pCore
->
window
()
->
addAction
(
QStringLiteral
(
"monitor_seek_backward"
),
monitorSeekBackward
,
Qt
::
Key_J
);
QAction
*
monitorSeekBackwardOneFrame
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"media-skip-backward"
)),
i18n
(
"Rewind 1 Frame"
),
this
);
...
...
@@ -399,7 +395,7 @@ void MonitorManager::setupActions()
pCore
->
window
()
->
addAction
(
QStringLiteral
(
"monitor_seek_backward-one-second"
),
monitorSeekBackwardOneSecond
,
Qt
::
SHIFT
+
Qt
::
Key_Left
);
QAction
*
monitorSeekForward
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"media-seek-forward"
)),
i18n
(
"Forward"
),
this
);
connect
(
monitorSeekForward
,
SIGNAL
(
triggered
(
bool
)),
SLOT
(
slotForward
())
);
connect
(
monitorSeekForward
,
&
QAction
::
triggered
,
this
,
&
MonitorManager
::
slotForward
);
pCore
->
window
()
->
addAction
(
QStringLiteral
(
"monitor_seek_forward"
),
monitorSeekForward
,
Qt
::
Key_L
);
QAction
*
projectStart
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"go-first"
)),
i18n
(
"Go to Project Start"
),
this
);
...
...
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