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
22dc6a7e
Commit
22dc6a7e
authored
Apr 04, 2022
by
Jean-Baptiste Mardelle
Browse files
Fix play zone seeking to first frame of timeline
parent
803fcbee
Pipeline
#159082
passed with stage
in 9 minutes
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/monitor/glwidget.cpp
View file @
22dc6a7e
...
...
@@ -679,7 +679,7 @@ void GLWidget::refresh()
}
}
bool
GLWidget
::
checkFrameNumber
(
int
pos
,
int
offset
,
bool
isPlaying
)
bool
GLWidget
::
checkFrameNumber
(
int
pos
,
bool
isPlaying
)
{
const
double
speed
=
m_producer
->
get_speed
();
m_proxy
->
positionFromConsumer
(
pos
,
isPlaying
);
...
...
@@ -687,6 +687,8 @@ bool GLWidget::checkFrameNumber(int pos, int offset, bool isPlaying)
if
(
isPlaying
&&
pos
>=
m_loopOut
)
{
m_consumer
->
purge
();
if
(
!
m_isLoopMode
)
{
// end play zone mode
m_isZoneMode
=
false
;
m_producer
->
set_speed
(
0
);
m_proxy
->
setSpeed
(
0
);
m_consumer
->
set
(
"refresh"
,
0
);
...
...
src/monitor/glwidget.h
View file @
22dc6a7e
...
...
@@ -99,7 +99,7 @@ public:
void
releaseMonitor
();
int
droppedFrames
()
const
;
void
resetDrops
();
bool
checkFrameNumber
(
int
pos
,
int
offset
,
bool
isPlaying
);
bool
checkFrameNumber
(
int
pos
,
bool
isPlaying
);
/** @brief Return current timeline position */
int
getCurrentPos
()
const
;
/** @brief Requests a monitor refresh */
...
...
src/monitor/monitor.cpp
View file @
22dc6a7e
...
...
@@ -2136,7 +2136,7 @@ void Monitor::updateAudioForAnalysis()
void
Monitor
::
onFrameDisplayed
(
const
SharedFrame
&
frame
)
{
if
(
!
m_glMonitor
->
checkFrameNumber
(
frame
.
get_position
(),
m_offset
,
m_playAction
->
isActive
()))
{
if
(
!
m_glMonitor
->
checkFrameNumber
(
frame
.
get_position
(),
m_playAction
->
isActive
()))
{
updatePlayAction
(
false
);
}
emit
m_monitorManager
->
frameDisplayed
(
frame
);
...
...
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