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
97cf5966
Commit
97cf5966
authored
Dec 31, 2021
by
Jean-Baptiste Mardelle
Browse files
Fix compilation warnings (function type compatibility)
parent
ab2990eb
Pipeline
#116426
passed with stage
in 5 minutes and 7 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/monitor/glwidget.cpp
View file @
97cf5966
...
...
@@ -861,7 +861,7 @@ void GLWidget::startGlsl()
}
}
static
void
onThreadStarted
(
mlt_properties
owner
,
GLWidget
*
self
)
static
void
onThreadStarted
(
mlt_properties
owner
,
GLWidget
*
self
,
mlt_event_data
)
{
Q_UNUSED
(
owner
)
self
->
startGlsl
();
...
...
@@ -892,7 +892,7 @@ void GLWidget::stopGlsl()
m_texture
[
0
]
=
0
;
}
static
void
onThreadStopped
(
mlt_properties
owner
,
GLWidget
*
self
)
static
void
onThreadStopped
(
mlt_properties
owner
,
GLWidget
*
self
,
mlt_event_data
)
{
Q_UNUSED
(
owner
)
self
->
stopGlsl
();
...
...
@@ -1401,11 +1401,10 @@ void GLWidget::on_frame_show(mlt_consumer, GLWidget* widget, mlt_event_data data
}
}
void
GLWidget
::
on_gl_nosync_frame_show
(
mlt_consumer
,
void
*
self
,
mlt_frame
frame_ptr
)
void
GLWidget
::
on_gl_nosync_frame_show
(
mlt_consumer
,
GLWidget
*
widget
,
mlt_event_data
data
)
{
Mlt
::
Frame
frame
(
frame
_ptr
);
auto
frame
=
Mlt
::
EventData
(
data
).
to_
frame
(
);
if
(
frame
.
get_int
(
"rendered"
)
!=
0
)
{
auto
*
widget
=
static_cast
<
GLWidget
*>
(
self
);
int
timeout
=
(
widget
->
consumer
()
->
get_int
(
"real_time"
)
>
0
)
?
0
:
1000
;
if
((
widget
->
m_frameRenderer
!=
nullptr
)
&&
widget
->
m_frameRenderer
->
semaphore
()
->
tryAcquire
(
1
,
timeout
))
{
QMetaObject
::
invokeMethod
(
widget
->
m_frameRenderer
,
"showGLNoSyncFrame"
,
Qt
::
QueuedConnection
,
Q_ARG
(
Mlt
::
Frame
,
frame
));
...
...
@@ -1413,11 +1412,10 @@ void GLWidget::on_gl_nosync_frame_show(mlt_consumer, void *self, mlt_frame frame
}
}
void
GLWidget
::
on_gl_frame_show
(
mlt_consumer
,
void
*
self
,
mlt_frame
frame_ptr
)
void
GLWidget
::
on_gl_frame_show
(
mlt_consumer
,
GLWidget
*
widget
,
mlt_event_data
data
)
{
Mlt
::
Frame
frame
(
frame
_ptr
);
auto
frame
=
Mlt
::
EventData
(
data
).
to_
frame
(
);
if
(
frame
.
get_int
(
"rendered"
)
!=
0
)
{
auto
*
widget
=
static_cast
<
GLWidget
*>
(
self
);
int
timeout
=
(
widget
->
consumer
()
->
get_int
(
"real_time"
)
>
0
)
?
0
:
1000
;
if
((
widget
->
m_frameRenderer
!=
nullptr
)
&&
widget
->
m_frameRenderer
->
semaphore
()
->
tryAcquire
(
1
,
timeout
))
{
QMetaObject
::
invokeMethod
(
widget
->
m_frameRenderer
,
"showGLFrame"
,
Qt
::
QueuedConnection
,
Q_ARG
(
Mlt
::
Frame
,
frame
));
...
...
src/monitor/glwidget.h
View file @
97cf5966
...
...
@@ -233,8 +233,8 @@ private:
std
::
shared_ptr
<
Mlt
::
Producer
>
m_blackClip
;
static
void
on_frame_show
(
mlt_consumer
,
GLWidget
*
widget
,
mlt_event_data
);
static
void
on_frame_render
(
mlt_consumer
,
GLWidget
*
widget
,
mlt_frame
frame
);
static
void
on_gl_frame_show
(
mlt_consumer
,
void
*
self
,
mlt_frame
frame_ptr
);
static
void
on_gl_nosync_frame_show
(
mlt_consumer
,
void
*
self
,
mlt_frame
frame_ptr
);
static
void
on_gl_frame_show
(
mlt_consumer
,
GLWidget
*
widget
,
mlt_event_data
data
);
static
void
on_gl_nosync_frame_show
(
mlt_consumer
,
GLWidget
*
widget
,
mlt_event_data
data
);
QOpenGLFramebufferObject
*
m_fbo
;
void
refreshSceneLayout
();
void
resetZoneMode
();
...
...
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