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
a2ddba33
Commit
a2ddba33
authored
Aug 21, 2009
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modules: Use access_GetParentInput and demux_GetParentInput.
parent
0d1f966a
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
10 additions
and
15 deletions
+10
-15
modules/access/cdda.c
modules/access/cdda.c
+1
-1
modules/access/cdda/access.c
modules/access/cdda/access.c
+1
-2
modules/access/cdda/info.c
modules/access/cdda/info.c
+1
-1
modules/access/dvdnav.c
modules/access/dvdnav.c
+1
-1
modules/access/mms/mmsh.c
modules/access/mms/mmsh.c
+1
-1
modules/access/vcdx/access.c
modules/access/vcdx/access.c
+1
-3
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+1
-1
modules/demux/playlist/playlist.c
modules/demux/playlist/playlist.c
+1
-1
modules/misc/lua/demux.c
modules/misc/lua/demux.c
+1
-2
modules/services_discovery/sap.c
modules/services_discovery/sap.c
+1
-2
No files found.
modules/access/cdda.c
View file @
a2ddba33
...
...
@@ -177,7 +177,7 @@ static int Open( vlc_object_t *p_this )
if
(
p_sys
->
i_track
<
0
)
{
/* We only do separate items if the whole disc is requested */
input_thread_t
*
p_input
=
(
input_thread_t
*
)
vlc_object_find
(
p_access
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
input_thread_t
*
p_input
=
access_GetParentInput
(
p_access
);
i_ret
=
-
1
;
if
(
p_input
)
...
...
modules/access/cdda/access.c
View file @
a2ddba33
...
...
@@ -664,8 +664,7 @@ int CDDAOpen( vlc_object_t *p_this )
config_GetInt
(
p_this
,
MODULE_STRING
"-blocks-per-read"
);
p_cdda
->
last_disc_frame
=
cdio_get_track_lsn
(
p_cdio
,
CDIO_CDROM_LEADOUT_TRACK
);
p_cdda
->
p_input
=
vlc_object_find
(
p_access
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
p_cdda
->
p_input
=
access_GetParentInput
(
p_access
);
if
(
0
==
p_cdda
->
i_blocks_per_read
)
p_cdda
->
i_blocks_per_read
=
DEFAULT_BLOCKS_PER_READ
;
...
...
modules/access/cdda/info.c
View file @
a2ddba33
...
...
@@ -860,7 +860,7 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
}
else
{
input_thread_t
*
p_input
=
(
input_thread_t
*
)
vlc_object_find
(
p_access
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
input_thread_t
*
p_input
=
access_GetParentInput
(
p_access
);
if
(
!
p_input
)
return
VLC_EGENERIC
;
...
...
modules/access/dvdnav.c
View file @
a2ddba33
...
...
@@ -339,7 +339,7 @@ static int Open( vlc_object_t *p_this )
/* FIXME hack hack hack hack FIXME */
/* Get p_input and create variable */
p_sys
->
p_input
=
vlc_object_find
(
p_demux
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
p_sys
->
p_input
=
demux_GetParentInput
(
p_demux
);
var_Create
(
p_sys
->
p_input
,
"x-start"
,
VLC_VAR_INTEGER
);
var_Create
(
p_sys
->
p_input
,
"y-start"
,
VLC_VAR_INTEGER
);
var_Create
(
p_sys
->
p_input
,
"x-end"
,
VLC_VAR_INTEGER
);
...
...
modules/access/mms/mmsh.c
View file @
a2ddba33
...
...
@@ -167,7 +167,7 @@ int MMSHOpen( access_t *p_access )
{
msg_Dbg
(
p_access
,
"redirection to %s"
,
psz_location
);
input_thread_t
*
p_input
=
vlc_object_find
(
p_access
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
input_thread_t
*
p_input
=
access_GetParentInput
(
p_access
);
input_item_t
*
p_new_loc
;
if
(
!
p_input
)
...
...
modules/access/vcdx/access.c
View file @
a2ddba33
...
...
@@ -894,9 +894,7 @@ VCDOpen ( vlc_object_t *p_this )
"-track-length"
);
p_vcdplayer
->
in_still
=
false
;
p_vcdplayer
->
play_item
.
type
=
VCDINFO_ITEM_TYPE_NOTFOUND
;
p_vcdplayer
->
p_input
=
vlc_object_find
(
p_access
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
p_vcdplayer
->
p_input
=
access_GetParentInput
(
p_access
);
// p_vcdplayer->p_meta = vlc_meta_New();
p_vcdplayer
->
p_segments
=
NULL
;
p_vcdplayer
->
p_entries
=
NULL
;
...
...
modules/demux/mp4/mp4.c
View file @
a2ddba33
...
...
@@ -369,7 +369,7 @@ static int Open( vlc_object_t * p_this )
msg_Dbg
(
p_demux
,
"detected playlist mov file (%d ref)"
,
i_count
);
input_thread_t
*
p_input
=
vlc_object_find
(
p_demux
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
input_thread_t
*
p_input
=
demux_GetParentInput
(
p_demux
);
input_item_t
*
p_current
=
input_GetItem
(
p_input
);
for
(
i
=
0
;
i
<
i_count
;
i
++
)
...
...
modules/demux/playlist/playlist.c
View file @
a2ddba33
...
...
@@ -167,7 +167,7 @@ vlc_module_end ()
input_item_t
*
GetCurrentItem
(
demux_t
*
p_demux
)
{
input_thread_t
*
p_input_thread
=
(
input_thread_t
*
)
vlc_object_find
(
p_demux
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
;
input_thread_t
*
p_input_thread
=
demux_GetParentInput
(
p_demux
)
;
input_item_t
*
p_current_input
=
input_GetItem
(
p_input_thread
);
vlc_gc_incref
(
p_current_input
);
vlc_object_release
(
p_input_thread
);
...
...
modules/misc/lua/demux.c
View file @
a2ddba33
...
...
@@ -248,8 +248,7 @@ static int Demux( demux_t *p_demux )
lua_State
*
L
=
p_demux
->
p_sys
->
L
;
char
*
psz_filename
=
p_demux
->
p_sys
->
psz_filename
;
input_thread_t
*
p_input_thread
=
(
input_thread_t
*
)
vlc_object_find
(
p_demux
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
input_thread_t
*
p_input_thread
=
demux_GetParentInput
(
p_demux
);
input_item_t
*
p_current_input
=
input_GetItem
(
p_input_thread
);
playlist_t
*
p_playlist
=
pl_Hold
(
p_demux
);
...
...
modules/services_discovery/sap.c
View file @
a2ddba33
...
...
@@ -651,8 +651,7 @@ static int Demux( demux_t *p_demux )
input_thread_t
*
p_input
;
input_item_t
*
p_parent_input
;
p_input
=
(
input_thread_t
*
)
vlc_object_find
(
p_demux
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
p_input
=
demux_GetParentInput
(
p_demux
);
assert
(
p_input
);
if
(
!
p_input
)
{
...
...
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