Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
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
videolan
vlc-2-2
Commits
87ce9b02
Commit
87ce9b02
authored
Dec 03, 2010
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dvdnav: use the right type of the vout object.
parent
fd463225
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
13 deletions
+10
-13
modules/access/dvdnav.c
modules/access/dvdnav.c
+10
-13
No files found.
modules/access/dvdnav.c
View file @
87ce9b02
...
...
@@ -38,6 +38,7 @@
#include <vlc_charset.h>
#include <vlc_fs.h>
#include <vlc_url.h>
#include <vlc_vout.h>
#include <vlc_dialog.h>
...
...
@@ -129,7 +130,7 @@ struct demux_sys_t
input_thread_t
*
p_input
;
/* event */
v
lc_object
_t
*
p_vout
;
v
out_thread
_t
*
p_vout
;
/* palette for menus */
uint32_t
clut
[
16
];
...
...
@@ -1425,22 +1426,18 @@ static int EventIntf( vlc_object_t *p_input, char const *psz_var,
if
(
val
.
i_int
==
INPUT_EVENT_VOUT
)
{
vlc_object_t
*
p_vout
;
p_vout
=
p_sys
->
p_vout
;
if
(
p_vout
!=
NULL
)
if
(
p_sys
->
p_vout
!=
NULL
)
{
var_DelCallback
(
p_vout
,
"mouse-moved"
,
EventMouse
,
p_demux
);
var_DelCallback
(
p_vout
,
"mouse-clicked"
,
EventMouse
,
p_demux
);
vlc_object_release
(
p_vout
);
var_DelCallback
(
p_
sys
->
p_
vout
,
"mouse-moved"
,
EventMouse
,
p_demux
);
var_DelCallback
(
p_
sys
->
p_
vout
,
"mouse-clicked"
,
EventMouse
,
p_demux
);
vlc_object_release
(
p_
sys
->
p_
vout
);
}
p_vout
=
(
vlc_object_t
*
)
input_GetVout
(
(
input_thread_t
*
)
p_input
);
p_sys
->
p_vout
=
p_vout
;
if
(
p_vout
!=
NULL
)
p_sys
->
p_vout
=
input_GetVout
(
(
input_thread_t
*
)
p_input
);
if
(
p_sys
->
p_vout
!=
NULL
)
{
var_AddCallback
(
p_vout
,
"mouse-moved"
,
EventMouse
,
p_demux
);
var_AddCallback
(
p_vout
,
"mouse-clicked"
,
EventMouse
,
p_demux
);
var_AddCallback
(
p_
sys
->
p_
vout
,
"mouse-moved"
,
EventMouse
,
p_demux
);
var_AddCallback
(
p_
sys
->
p_
vout
,
"mouse-clicked"
,
EventMouse
,
p_demux
);
}
}
(
void
)
psz_var
;
(
void
)
oldval
;
...
...
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