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
132855eb
Commit
132855eb
authored
Dec 08, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed input_get_event_manager naming scheme.
parent
e03ea0d7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
9 deletions
+14
-9
include/vlc_input.h
include/vlc_input.h
+7
-2
src/control/media_player.c
src/control/media_player.c
+2
-2
src/input/input.c
src/input/input.c
+2
-2
src/libvlccore.sym
src/libvlccore.sym
+1
-1
src/playlist/engine.c
src/playlist/engine.c
+2
-2
No files found.
include/vlc_input.h
View file @
132855eb
...
...
@@ -667,14 +667,19 @@ static inline int input_AddSubtitle( input_thread_t *p_input, const char *psz_ur
return
input_Control
(
p_input
,
INPUT_ADD_SUBTITLE
,
psz_url
,
b_check_extension
);
}
/**
* It will return the input event manager.
*
* You are advised to use "intf-event" instead if you want completness.
*/
VLC_EXPORT
(
vlc_event_manager_t
*
,
input_GetEventManager
,
(
input_thread_t
*
)
);
/* */
typedef
struct
input_clock_t
input_clock_t
;
VLC_EXPORT
(
decoder_t
*
,
input_DecoderNew
,
(
input_thread_t
*
,
es_format_t
*
,
input_clock_t
*
,
sout_instance_t
*
)
);
VLC_EXPORT
(
void
,
input_DecoderDelete
,
(
decoder_t
*
)
);
VLC_EXPORT
(
void
,
input_DecoderDecode
,(
decoder_t
*
,
block_t
*
)
);
VLC_EXPORT
(
vlc_event_manager_t
*
,
input_get_event_manager
,
(
input_thread_t
*
)
);
/**
* This function allows to split a MRL into access, demux and path part.
*
...
...
src/control/media_player.c
View file @
132855eb
...
...
@@ -80,7 +80,7 @@ static void release_input_thread( libvlc_media_player_t *p_mi )
/* No one is tracking this input_thread appart us. Destroy it */
if
(
p_mi
->
b_own_its_input_thread
)
{
vlc_event_manager_t
*
p_em
=
input_
get_event_m
anager
(
p_input_thread
);
vlc_event_manager_t
*
p_em
=
input_
GetEventM
anager
(
p_input_thread
);
vlc_event_detach
(
p_em
,
vlc_InputStateChanged
,
input_state_changed
,
p_mi
);
var_DelCallback
(
p_input_thread
,
"can-seek"
,
input_seekable_changed
,
p_mi
);
var_DelCallback
(
p_input_thread
,
"can-pause"
,
input_pausable_changed
,
p_mi
);
...
...
@@ -573,7 +573,7 @@ void libvlc_media_player_play( libvlc_media_player_t *p_mi,
var_Set
(
p_input_thread
,
"drawable"
,
val
);
}
vlc_event_manager_t
*
p_em
=
input_
get_event_m
anager
(
p_input_thread
);
vlc_event_manager_t
*
p_em
=
input_
GetEventM
anager
(
p_input_thread
);
vlc_event_attach
(
p_em
,
vlc_InputStateChanged
,
input_state_changed
,
p_mi
);
var_AddCallback
(
p_input_thread
,
"can-seek"
,
input_seekable_changed
,
p_mi
);
...
...
src/input/input.c
View file @
132855eb
...
...
@@ -3199,9 +3199,9 @@ void input_UpdateStatistic( input_thread_t *p_input,
vlc_mutex_unlock
(
&
p_input
->
p
->
counters
.
counters_lock
);
}
/*****************************************************************************
* input_
get_event_m
anager
* input_
GetEventM
anager
*****************************************************************************/
vlc_event_manager_t
*
input_
get_event_m
anager
(
input_thread_t
*
p_input
)
vlc_event_manager_t
*
input_
GetEventM
anager
(
input_thread_t
*
p_input
)
{
return
&
p_input
->
p
->
event_manager
;
}
...
...
src/libvlccore.sym
View file @
132855eb
...
...
@@ -159,7 +159,7 @@ __input_CreateThread
input_DecoderDecode
input_DecoderDelete
input_DecoderNew
input_
get_event_m
anager
input_
GetEventM
anager
input_GetItem
input_item_AddInfo
input_item_AddOpt
...
...
src/playlist/engine.c
View file @
132855eb
...
...
@@ -250,7 +250,7 @@ void playlist_release_current_input( playlist_t * p_playlist )
if
(
!
pl_priv
(
p_playlist
)
->
p_input
)
return
;
input_thread_t
*
p_input
=
pl_priv
(
p_playlist
)
->
p_input
;
vlc_event_manager_t
*
p_em
=
input_
get_event_m
anager
(
p_input
);
vlc_event_manager_t
*
p_em
=
input_
GetEventM
anager
(
p_input
);
vlc_event_detach
(
p_em
,
vlc_InputStateChanged
,
input_state_changed
,
p_playlist
);
...
...
@@ -277,7 +277,7 @@ void playlist_set_current_input(
{
vlc_object_hold
(
p_input
);
pl_priv
(
p_playlist
)
->
p_input
=
p_input
;
vlc_event_manager_t
*
p_em
=
input_
get_event_m
anager
(
p_input
);
vlc_event_manager_t
*
p_em
=
input_
GetEventM
anager
(
p_input
);
vlc_event_attach
(
p_em
,
vlc_InputStateChanged
,
input_state_changed
,
p_playlist
);
vlc_event_attach
(
p_em
,
vlc_InputSelectedStreamChanged
,
...
...
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