Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
47fa9606
Commit
47fa9606
authored
May 17, 2018
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
display: remove the manage callback
parent
f1aa4ce5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
12 deletions
+3
-12
include/vlc_vout_display.h
include/vlc_vout_display.h
+0
-3
src/video_output/display.c
src/video_output/display.c
+3
-9
No files found.
include/vlc_vout_display.h
View file @
47fa9606
...
...
@@ -309,9 +309,6 @@ struct vout_display_t {
/* Control on the module (mandatory) */
int
(
*
control
)(
vout_display_t
*
,
int
,
va_list
);
/* Manage pending event (optional) */
void
(
*
manage
)(
vout_display_t
*
)
VLC_DEPRECATED
;
/* Private place holder for the vout_display_t module (optional)
*
* A module is free to use it as it wishes.
...
...
src/video_output/display.c
View file @
47fa9606
...
...
@@ -45,6 +45,7 @@
#include "event.h"
static
void
SplitterManage
(
vout_display_t
*
vd
);
static
void
SplitterClose
(
vout_display_t
*
vd
);
/*****************************************************************************
...
...
@@ -100,7 +101,6 @@ static vout_display_t *vout_display_New(vlc_object_t *obj,
vd
->
prepare
=
NULL
;
vd
->
display
=
NULL
;
vd
->
control
=
NULL
;
vd
->
manage
=
NULL
;
vd
->
sys
=
NULL
;
vd
->
owner
=
*
owner
;
...
...
@@ -146,12 +146,6 @@ static int vout_display_Control(vout_display_t *vd, int query, ...)
return
result
;
}
static
void
vout_display_Manage
(
vout_display_t
*
vd
)
{
if
(
vd
->
manage
)
vd
->
manage
(
vd
);
}
/* */
void
vout_display_GetDefaultDisplaySize
(
unsigned
*
width
,
unsigned
*
height
,
const
video_format_t
*
source
,
...
...
@@ -717,7 +711,8 @@ bool vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures)
{
vout_display_owner_sys_t
*
osys
=
vd
->
owner
.
sys
;
vout_display_Manage
(
vd
);
if
(
osys
->
is_splitter
)
SplitterManage
(
vd
);
/* Handle mouse timeout */
const
mtime_t
date
=
mdate
();
...
...
@@ -1447,7 +1442,6 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout,
wrapper
->
prepare
=
SplitterPrepare
;
wrapper
->
display
=
SplitterDisplay
;
wrapper
->
control
=
SplitterControl
;
wrapper
->
manage
=
SplitterManage
;
wrapper
->
sys
=
sys
;
/* */
...
...
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