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
4587d293
Commit
4587d293
authored
Oct 30, 2018
by
Vincent Pinon
Committed by
Vincent Pinon
Oct 30, 2018
Browse files
Fix play/pause on Windows
parent
27c64c00
Changes
1
Show whitespace changes
Inline
Side-by-side
src/renderer.cpp
View file @
4587d293
...
@@ -743,6 +743,7 @@ void Render::switchPlay(bool play, double speed)
...
@@ -743,6 +743,7 @@ void Render::switchPlay(bool play, double speed)
QMutexLocker
locker
(
&
m_mutex
);
QMutexLocker
locker
(
&
m_mutex
);
requestedSeekPosition
=
SEEK_INACTIVE
;
requestedSeekPosition
=
SEEK_INACTIVE
;
if
(
!
m_mltProducer
||
!
m_mltConsumer
||
!
m_isActive
)
{
if
(
!
m_mltProducer
||
!
m_mltConsumer
||
!
m_isActive
)
{
qWarning
(
"no producer/consumer!"
);
return
;
return
;
}
}
if
(
m_isZoneMode
)
{
if
(
m_isZoneMode
)
{
...
@@ -753,31 +754,15 @@ void Render::switchPlay(bool play, double speed)
...
@@ -753,31 +754,15 @@ void Render::switchPlay(bool play, double speed)
if
(
m_name
==
Kdenlive
::
ClipMonitor
&&
m_mltConsumer
->
position
()
==
m_mltProducer
->
get_out
()
&&
speed
>
0
)
{
if
(
m_name
==
Kdenlive
::
ClipMonitor
&&
m_mltConsumer
->
position
()
==
m_mltProducer
->
get_out
()
&&
speed
>
0
)
{
m_mltProducer
->
seek
(
0
);
m_mltProducer
->
seek
(
0
);
}
}
if
(
m_mltConsumer
->
get_int
(
"real_time"
)
!=
m_qmlView
->
realTime
())
{
m_mltProducer
->
set_speed
(
speed
);
m_mltConsumer
->
set
(
"real_time"
,
m_qmlView
->
realTime
());
m_mltConsumer
->
set
(
"buffer"
,
25
);
m_mltConsumer
->
set
(
"prefill"
,
1
);
// Changes to real_time require a consumer restart if running.
if
(
!
m_mltConsumer
->
is_stopped
())
{
m_mltConsumer
->
stop
();
}
}
if
(
currentSpeed
==
0
)
{
m_mltConsumer
->
start
();
m_mltConsumer
->
start
();
m_isRefreshing
=
true
;
m_isRefreshing
=
true
;
m_mltConsumer
->
set
(
"refresh"
,
1
);
m_mltConsumer
->
set
(
"refresh"
,
1
);
}
else
{
}
else
{
m_mltProducer
->
set_speed
(
0
);
m_mltProducer
->
seek
(
m_mltConsumer
->
position
()
+
1
);
m_mltProducer
->
seek
(
m_mltConsumer
->
position
()
+
1
);
m_mltConsumer
->
purge
();
m_mltConsumer
->
purge
();
}
m_mltConsumer
->
start
();
m_mltProducer
->
set_speed
(
speed
);
}
else
{
m_mltConsumer
->
set
(
"real_time"
,
-
1
);
m_mltConsumer
->
set
(
"buffer"
,
0
);
m_mltConsumer
->
set
(
"prefill"
,
0
);
m_mltProducer
->
set_speed
(
0.0
);
m_mltProducer
->
seek
(
m_mltConsumer
->
position
()
+
1
);
m_mltConsumer
->
purge
();
}
}
}
}
...
...
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