Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
d11fd0d1
Commit
d11fd0d1
authored
Aug 15, 2008
by
Pierre d'Herbemont
Browse files
codecleanup: Replace input_Item by input_item.
parent
7f2fcb75
Changes
47
Hide whitespace changes
Inline
Side-by-side
include/vlc_input.h
View file @
d11fd0d1
...
...
@@ -103,7 +103,7 @@ struct input_item_t
#define ITEM_TYPE_NODE 8
#define ITEM_TYPE_NUMBER 9
static
inline
void
input_
I
temCopyOptions
(
input_item_t
*
p_parent
,
static
inline
void
input_
i
tem
_
CopyOptions
(
input_item_t
*
p_parent
,
input_item_t
*
p_child
)
{
int
i
;
...
...
@@ -137,7 +137,7 @@ static inline void input_item_SetName( input_item_t *p_item, const char *psz_nam
* Like the playlist, that there is a new sub item. With this design
* It is not the input item's responsability to keep all the ref of
* the input item children. */
static
inline
void
input_
I
temAddSubItem
(
input_item_t
*
p_parent
,
static
inline
void
input_
i
tem
_
AddSubItem
(
input_item_t
*
p_parent
,
input_item_t
*
p_child
)
{
vlc_event_t
event
;
...
...
@@ -150,22 +150,22 @@ static inline void input_ItemAddSubItem( input_item_t *p_parent,
vlc_event_send
(
&
p_parent
->
event_manager
,
&
event
);
}
/* Flags handled past input_
I
temAddOpt() */
/* Flags handled past input_
i
tem
_
AddOpt() */
#define VLC_INPUT_OPTION_TRUSTED 0x2
/* Flags handled within input_
I
temAddOpt() */
/* Flags handled within input_
i
tem
_
AddOpt() */
#define VLC_INPUT_OPTION_UNIQUE 0x100
VLC_EXPORT
(
int
,
input_
I
temAddOpt
,
(
input_item_t
*
,
const
char
*
str
,
unsigned
flags
)
);
VLC_EXPORT
(
int
,
input_
i
tem
_
AddOpt
,
(
input_item_t
*
,
const
char
*
str
,
unsigned
flags
)
);
static
inline
int
input_
I
temAddOption
(
input_item_t
*
item
,
const
char
*
str
)
int
input_
i
tem
_
AddOption
(
input_item_t
*
item
,
const
char
*
str
)
{
return
input_
I
temAddOpt
(
item
,
str
,
VLC_INPUT_OPTION_TRUSTED
);
return
input_
i
tem
_
AddOpt
(
item
,
str
,
VLC_INPUT_OPTION_TRUSTED
);
}
static
inline
int
input_
I
temHasErrorWhenReading
(
input_item_t
*
item
)
int
input_
i
tem
_
HasErrorWhenReading
(
input_item_t
*
item
)
{
return
item
->
b_error_when_reading
;
}
...
...
@@ -325,16 +325,16 @@ static inline void input_item_MetaMerge( input_item_t *p_i, const vlc_meta_t * p
#define input_item_GetTrackID( item ) input_item_GetMeta( item, vlc_meta_TrackID )
#define input_item_GetSetting( item ) input_item_GetMeta( item, vlc_meta_Setting )
VLC_EXPORT
(
char
*
,
input_
I
temGetInfo
,
(
input_item_t
*
p_i
,
const
char
*
psz_cat
,
const
char
*
psz_name
)
);
VLC_EXPORT
(
int
,
input_
I
temAddInfo
,
(
input_item_t
*
p_i
,
const
char
*
psz_cat
,
const
char
*
psz_name
,
const
char
*
psz_format
,
...
)
LIBVLC_FORMAT
(
4
,
5
)
);
VLC_EXPORT
(
char
*
,
input_
i
tem
_
GetInfo
,
(
input_item_t
*
p_i
,
const
char
*
psz_cat
,
const
char
*
psz_name
)
);
VLC_EXPORT
(
int
,
input_
i
tem
_
AddInfo
,
(
input_item_t
*
p_i
,
const
char
*
psz_cat
,
const
char
*
psz_name
,
const
char
*
psz_format
,
...
)
LIBVLC_FORMAT
(
4
,
5
)
);
#define input_
I
temNew( a,b,c ) input_
I
temNewExt( a, b, c, 0, NULL, -1 )
#define input_
I
temNewExt(a,b,c,d,e,f) __input_
I
temNewExt( VLC_OBJECT(a),b,c,d,e,f)
VLC_EXPORT
(
input_item_t
*
,
__input_
I
temNewExt
,
(
vlc_object_t
*
,
const
char
*
,
const
char
*
,
int
,
const
char
*
const
*
,
mtime_t
i_duration
)
);
VLC_EXPORT
(
input_item_t
*
,
input_
I
temNewWithType
,
(
vlc_object_t
*
,
const
char
*
,
const
char
*
e
,
int
,
const
char
*
const
*
,
mtime_t
i_duration
,
int
)
);
#define input_
i
tem
_
New( a,b,c ) input_
i
tem
_
NewExt( a, b, c, 0, NULL, -1 )
#define input_
i
tem
_
NewExt(a,b,c,d,e,f) __input_
i
tem
_
NewExt( VLC_OBJECT(a),b,c,d,e,f)
VLC_EXPORT
(
input_item_t
*
,
__input_
i
tem
_
NewExt
,
(
vlc_object_t
*
,
const
char
*
,
const
char
*
,
int
,
const
char
*
const
*
,
mtime_t
i_duration
)
);
VLC_EXPORT
(
input_item_t
*
,
input_
i
tem
_
NewWithType
,
(
vlc_object_t
*
,
const
char
*
,
const
char
*
e
,
int
,
const
char
*
const
*
,
mtime_t
i_duration
,
int
)
);
#define input_
I
temGetById(a,b) __input_
I
temGetById( VLC_OBJECT(a),b )
VLC_EXPORT
(
input_item_t
*
,
__input_
I
temGetById
,
(
vlc_object_t
*
,
int
)
);
#define input_
i
tem
_
GetById(a,b) __input_
i
tem
_
GetById( VLC_OBJECT(a),b )
VLC_EXPORT
(
input_item_t
*
,
__input_
i
tem
_
GetById
,
(
vlc_object_t
*
,
int
)
);
/*****************************************************************************
* Meta data helpers
...
...
include/vlc_playlist.h
View file @
d11fd0d1
...
...
@@ -409,7 +409,7 @@ static inline int playlist_Import( playlist_t *p_playlist, const char *psz_file)
input_item_t
*
p_input
;
snprintf
(
psz_uri
,
256
+
9
,
"file/://%s"
,
psz_file
);
const
char
*
const
psz_option
=
"meta-file"
;
p_input
=
input_
I
temNewExt
(
p_playlist
,
psz_uri
,
psz_file
,
p_input
=
input_
i
tem
_
NewExt
(
p_playlist
,
psz_uri
,
psz_file
,
1
,
&
psz_option
,
-
1
);
playlist_AddInput
(
p_playlist
,
p_input
,
PLAYLIST_APPEND
,
PLAYLIST_END
,
true
,
false
);
...
...
modules/access/cdda.c
View file @
d11fd0d1
...
...
@@ -467,12 +467,12 @@ static int GetTracks( access_t *p_access,
psz_name
=
NULL
;
/* Create playlist items */
p_input_item
=
input_
I
temNewWithType
(
VLC_OBJECT
(
p_playlist
),
p_input_item
=
input_
i
tem
_
NewWithType
(
VLC_OBJECT
(
p_playlist
),
psz_uri
,
psz_name
,
0
,
NULL
,
-
1
,
ITEM_TYPE_DISC
);
input_
I
temAddOption
(
p_input_item
,
psz_first
);
input_
I
temAddOption
(
p_input_item
,
psz_last
);
input_
I
temAddOption
(
p_input_item
,
psz_opt
);
input_
i
tem
_
AddOption
(
p_input_item
,
psz_first
);
input_
i
tem
_
AddOption
(
p_input_item
,
psz_last
);
input_
i
tem
_
AddOption
(
p_input_item
,
psz_opt
);
#ifdef HAVE_LIBCDDB
/* If we have CDDB info, change the name */
...
...
modules/access/directory.c
View file @
d11fd0d1
...
...
@@ -530,13 +530,13 @@ static int ReadDir( access_t *p_access, playlist_t *p_playlist,
memmove
(
psz_uri
+
7
,
psz_uri
,
sizeof
(
psz_uri
)
-
7
);
memcpy
(
psz_uri
,
"file://"
,
7
);
p_input
=
input_
I
temNewWithType
(
p_playlist
,
p_input
=
input_
i
tem
_
NewWithType
(
p_playlist
,
psz_uri
,
entry
,
0
,
NULL
,
-
1
,
ITEM_TYPE_FILE
);
if
(
p_input
!=
NULL
)
{
if
(
p_current_input
)
input_
I
temCopyOptions
(
p_current_input
,
p_input
);
input_
i
tem
_
CopyOptions
(
p_current_input
,
p_input
);
assert
(
p_parent_category
);
int
i_ret
=
playlist_BothAddInput
(
p_playlist
,
p_input
,
p_parent_category
,
...
...
modules/access/mms/mmsh.c
View file @
d11fd0d1
...
...
@@ -188,8 +188,8 @@ int MMSHOpen( access_t *p_access )
input_thread_t
*
p_input
=
vlc_object_find
(
p_access
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
input_item_t
*
p_new_loc
;
/** \bug we do not autodelete here */
p_new_loc
=
input_
I
temNew
(
p_access
,
psz_location
,
psz_location
);
input_
I
temAddSubItem
(
input_GetItem
(
p_input
),
p_new_loc
);
p_new_loc
=
input_
i
tem
_
New
(
p_access
,
psz_location
,
psz_location
);
input_
i
tem
_
AddSubItem
(
input_GetItem
(
p_input
),
p_new_loc
);
vlc_object_release
(
p_input
);
free
(
psz_location
);
...
...
modules/control/http/util.c
View file @
d11fd0d1
...
...
@@ -848,7 +848,7 @@ input_item_t *MRLParse( intf_thread_t *p_intf, char *_psz,
s_temp
=
s_mrl
+
strlen
(
s_mrl
);
}
p_input
=
input_
I
temNew
(
p_intf
,
s_mrl
,
psz_name
);
p_input
=
input_
i
tem
_
New
(
p_intf
,
s_mrl
,
psz_name
);
s_mrl
=
s_temp
;
/* now we can take care of the options */
...
...
@@ -861,7 +861,7 @@ input_item_t *MRLParse( intf_thread_t *p_intf, char *_psz,
{
s_temp
=
s_mrl
+
strlen
(
s_mrl
);
}
input_
I
temAddOption
(
p_input
,
s_mrl
);
input_
i
tem
_
AddOption
(
p_input
,
s_mrl
);
s_mrl
=
s_temp
;
}
...
...
modules/control/rc.c
View file @
d11fd0d1
...
...
@@ -2222,10 +2222,10 @@ static input_item_t *parse_MRL( intf_thread_t *p_intf, char *psz_mrl )
/* Now create a playlist item */
if
(
psz_item_mrl
)
{
p_item
=
input_
I
temNew
(
p_intf
,
psz_item_mrl
,
NULL
);
p_item
=
input_
i
tem
_
New
(
p_intf
,
psz_item_mrl
,
NULL
);
for
(
i
=
0
;
i
<
i_options
;
i
++
)
{
input_
I
temAddOption
(
p_item
,
ppsz_options
[
i
]
);
input_
i
tem
_
AddOption
(
p_item
,
ppsz_options
[
i
]
);
}
}
...
...
modules/demux/mp4/mp4.c
View file @
d11fd0d1
...
...
@@ -417,10 +417,10 @@ static int Open( vlc_object_t * p_this )
}
input_item_t
*
p_input
;
msg_Dbg
(
p_demux
,
"adding ref = `%s'"
,
psz_ref
);
p_input
=
input_
I
temNewExt
(
p_demux
,
psz_ref
,
NULL
,
p_input
=
input_
i
tem
_
NewExt
(
p_demux
,
psz_ref
,
NULL
,
0
,
NULL
,
-
1
);
input_
I
temCopyOptions
(
p_current
,
p_input
);
input_
I
temAddSubItem
(
p_current
,
p_input
);
input_
i
tem
_
CopyOptions
(
p_current
,
p_input
);
input_
i
tem
_
AddSubItem
(
p_current
,
p_input
);
vlc_gc_decref
(
p_input
);
}
else
...
...
modules/demux/playlist/asx.c
View file @
d11fd0d1
...
...
@@ -459,9 +459,9 @@ static int Demux( demux_t *p_demux )
psz_string
=
malloc
(
i_strlen
*
sizeof
(
char
)
+
1
);
memcpy
(
psz_string
,
psz_backup
,
i_strlen
);
psz_string
[
i_strlen
]
=
'\0'
;
p_input
=
input_
I
temNew
(
p_demux
,
psz_string
,
psz_title_asx
);
input_
I
temCopyOptions
(
p_current_input
,
p_input
);
input_
I
temAddSubItem
(
p_current_input
,
p_input
);
p_input
=
input_
i
tem
_
New
(
p_demux
,
psz_string
,
psz_title_asx
);
input_
i
tem
_
CopyOptions
(
p_current_input
,
p_input
);
input_
i
tem
_
AddSubItem
(
p_current_input
,
p_input
);
free
(
psz_string
);
}
else
continue
;
...
...
@@ -516,9 +516,9 @@ static int Demux( demux_t *p_demux )
/* create the new entry */
asprintf
(
&
psz_name
,
"%d %s"
,
i_entry_count
,
(
psz_title_entry
?
psz_title_entry
:
p_current_input
->
psz_name
)
);
p_entry
=
input_
I
temNewExt
(
p_demux
,
psz_href
,
psz_name
,
i_options
,
(
const
char
*
const
*
)
ppsz_options
,
-
1
);
p_entry
=
input_
i
tem
_
NewExt
(
p_demux
,
psz_href
,
psz_name
,
i_options
,
(
const
char
*
const
*
)
ppsz_options
,
-
1
);
FREENULL
(
psz_name
);
input_
I
temCopyOptions
(
p_current_input
,
p_entry
);
input_
i
tem
_
CopyOptions
(
p_current_input
,
p_entry
);
while
(
i_options
)
{
psz_name
=
ppsz_options
[
--
i_options
];
...
...
@@ -530,7 +530,7 @@ static int Demux( demux_t *p_demux )
if
(
psz_copyright_entry
)
input_item_SetCopyright
(
p_entry
,
psz_copyright_entry
);
if
(
psz_moreinfo_entry
)
input_item_SetURL
(
p_entry
,
psz_moreinfo_entry
);
if
(
psz_abstract_entry
)
input_item_SetDescription
(
p_entry
,
psz_abstract_entry
);
input_
I
temAddSubItem
(
p_current_input
,
p_entry
);
input_
i
tem
_
AddSubItem
(
p_current_input
,
p_entry
);
vlc_gc_decref
(
p_entry
);
}
...
...
modules/demux/playlist/b4s.c
View file @
d11fd0d1
...
...
@@ -256,7 +256,7 @@ static int Demux( demux_t *p_demux )
if
(
!
psz_elname
)
return
-
1
;
if
(
!
strcmp
(
psz_elname
,
"entry"
)
)
{
p_input
=
input_
I
temNewExt
(
p_demux
,
psz_mrl
,
psz_name
,
p_input
=
input_
i
tem
_
NewExt
(
p_demux
,
psz_mrl
,
psz_name
,
0
,
NULL
,
-
1
);
if
(
psz_now
)
input_item_SetNowPlaying
(
p_input
,
psz_now
);
...
...
@@ -267,7 +267,7 @@ static int Demux( demux_t *p_demux )
if
(
psz_bitrate
)
msg_Err
(
p_demux
,
"Unsupported meta bitrate"
);
input_
I
temAddSubItem
(
p_current_input
,
p_input
);
input_
i
tem
_
AddSubItem
(
p_current_input
,
p_input
);
vlc_gc_decref
(
p_input
);
FREENULL
(
psz_name
);
FREENULL
(
psz_mrl
);
...
...
modules/demux/playlist/dvb.c
View file @
d11fd0d1
...
...
@@ -117,13 +117,13 @@ static int Demux( demux_t *p_demux )
EnsureUTF8
(
psz_name
);
p_input
=
input_
I
temNewExt
(
p_demux
,
"dvb://"
,
psz_name
,
0
,
NULL
,
-
1
);
p_input
=
input_
i
tem
_
NewExt
(
p_demux
,
"dvb://"
,
psz_name
,
0
,
NULL
,
-
1
);
for
(
i
=
0
;
i
<
i_options
;
i
++
)
{
EnsureUTF8
(
ppsz_options
[
i
]
);
input_
I
temAddOption
(
p_input
,
ppsz_options
[
i
]
);
input_
i
tem
_
AddOption
(
p_input
,
ppsz_options
[
i
]
);
}
input_
I
temAddSubItem
(
p_current_input
,
p_input
);
input_
i
tem
_
AddSubItem
(
p_current_input
,
p_input
);
vlc_gc_decref
(
p_input
);
while
(
i_options
--
)
free
(
ppsz_options
[
i_options
]
);
free
(
ppsz_options
);
...
...
modules/demux/playlist/gvp.c
View file @
d11fd0d1
...
...
@@ -201,14 +201,14 @@ static int Demux( demux_t *p_demux )
}
else
{
p_input
=
input_
I
temNewExt
(
p_demux
,
p_input
=
input_
i
tem
_
NewExt
(
p_demux
,
psz_url
,
psz_title
,
0
,
NULL
,
-
1
);
#define SADD_INFO( type, field ) if( field ) { input_
I
temAddInfo( \
#define SADD_INFO( type, field ) if( field ) { input_
i
tem
_
AddInfo( \
p_input, _("Google Video"), _(type), "%s", field ) ; }
SADD_INFO
(
"gvp_version"
,
psz_version
);
SADD_INFO
(
"docid"
,
psz_docid
);
SADD_INFO
(
"description"
,
psz_description
);
input_
I
temAddSubItem
(
p_current_input
,
p_input
);
input_
i
tem
_
AddSubItem
(
p_current_input
,
p_input
);
vlc_gc_decref
(
p_input
);
}
...
...
modules/demux/playlist/ifo.c
View file @
d11fd0d1
...
...
@@ -95,8 +95,8 @@ static int Demux( demux_t *p_demux )
psz_url
=
(
char
*
)
malloc
(
len
+
1
);
snprintf
(
psz_url
,
len
+
1
,
"dvd://%s"
,
p_demux
->
psz_path
);
p_input
=
input_
I
temNewExt
(
p_demux
,
psz_url
,
psz_url
,
0
,
NULL
,
-
1
);
input_
I
temAddSubItem
(
p_current_input
,
p_input
);
p_input
=
input_
i
tem
_
NewExt
(
p_demux
,
psz_url
,
psz_url
,
0
,
NULL
,
-
1
);
input_
i
tem
_
AddSubItem
(
p_current_input
,
p_input
);
vlc_gc_decref
(
p_input
);
HANDLE_PLAY_AND_RELEASE
;
...
...
modules/demux/playlist/itml.c
View file @
d11fd0d1
...
...
@@ -380,9 +380,9 @@ static bool parse_track_dict COMPLEX_INTERFACE
memmove
(
psz_uri
+
7
,
psz_uri
+
17
,
strlen
(
psz_uri
)
-
9
);
msg_Info
(
p_demux
,
"Adding '%s'"
,
psz_uri
);
p_new_input
=
input_
I
temNewExt
(
p_demux
,
psz_uri
,
p_new_input
=
input_
i
tem
_
NewExt
(
p_demux
,
psz_uri
,
NULL
,
0
,
NULL
,
-
1
);
input_
I
temAddSubItem
(
p_input_item
,
p_new_input
);
input_
i
tem
_
AddSubItem
(
p_input_item
,
p_new_input
);
/* add meta info */
add_meta
(
p_new_input
,
p_track
);
...
...
modules/demux/playlist/m3u.c
View file @
d11fd0d1
...
...
@@ -217,15 +217,15 @@ static int Demux( demux_t *p_demux )
b_cleanup
=
true
;
if
(
!
psz_mrl
)
goto
error
;
p_input
=
input_
I
temNewExt
(
p_demux
,
psz_mrl
,
psz_name
,
p_input
=
input_
i
tem
_
NewExt
(
p_demux
,
psz_mrl
,
psz_name
,
0
,
NULL
,
i_duration
);
if
(
psz_artist
&&
*
psz_artist
)
input_item_SetArtist
(
p_input
,
psz_artist
);
input_
I
temAddSubItem
(
p_current_input
,
p_input
);
input_
i
tem
_
AddSubItem
(
p_current_input
,
p_input
);
for
(
int
i
=
0
;
i
<
i_options
;
i
++
)
input_
I
temAddOpt
(
p_input
,
ppsz_options
[
i
],
0
);
input_
i
tem
_
AddOpt
(
p_input
,
ppsz_options
[
i
],
0
);
vlc_gc_decref
(
p_input
);
free
(
psz_mrl
);
}
...
...
modules/demux/playlist/pls.c
View file @
d11fd0d1
...
...
@@ -159,10 +159,10 @@ static int Demux( demux_t *p_demux )
{
if
(
psz_mrl
)
{
p_input
=
input_
I
temNewExt
(
p_demux
,
psz_mrl
,
psz_name
,
p_input
=
input_
i
tem
_
NewExt
(
p_demux
,
psz_mrl
,
psz_name
,
0
,
NULL
,
-
1
);
input_
I
temCopyOptions
(
p_current_input
,
p_input
);
input_
I
temAddSubItem
(
p_current_input
,
p_input
);
input_
i
tem
_
CopyOptions
(
p_current_input
,
p_input
);
input_
i
tem
_
AddSubItem
(
p_current_input
,
p_input
);
vlc_gc_decref
(
p_input
);
}
else
...
...
@@ -215,9 +215,9 @@ static int Demux( demux_t *p_demux )
/* Add last object */
if
(
psz_mrl
)
{
p_input
=
input_
I
temNewExt
(
p_demux
,
psz_mrl
,
psz_name
,
0
,
NULL
,
-
1
);
input_
I
temCopyOptions
(
p_current_input
,
p_input
);
input_
I
temAddSubItem
(
p_current_input
,
p_input
);
p_input
=
input_
i
tem
_
NewExt
(
p_demux
,
psz_mrl
,
psz_name
,
0
,
NULL
,
-
1
);
input_
i
tem
_
CopyOptions
(
p_current_input
,
p_input
);
input_
i
tem
_
AddSubItem
(
p_current_input
,
p_input
);
vlc_gc_decref
(
p_input
);
free
(
psz_mrl_orig
);
psz_mrl
=
NULL
;
...
...
modules/demux/playlist/podcast.c
View file @
d11fd0d1
...
...
@@ -233,7 +233,7 @@ static int Demux( demux_t *p_demux )
#define ADD_GINFO( info, name ) \
else if( !b_item && !b_image && !strcmp( psz_elname, name ) ) \
{ \
input_
I
temAddInfo( p_current_input, _("Podcast Info"), \
input_
i
tem
_
AddInfo( p_current_input, _("Podcast Info"), \
_( info ), "%s", psz_text ); \
}
ADD_GINFO
(
"Podcast Link"
,
"link"
)
...
...
@@ -246,7 +246,7 @@ static int Demux( demux_t *p_demux )
&&
(
!
strcmp
(
psz_elname
,
"itunes:summary"
)
||!
strcmp
(
psz_elname
,
"description"
)
)
)
{
/* <description> isn't standard iTunes podcast stuff */
input_
I
temAddInfo
(
p_current_input
,
input_
i
tem
_
AddInfo
(
p_current_input
,
_
(
"Podcast Info"
),
_
(
"Podcast Summary"
),
"%s"
,
psz_text
);
}
...
...
@@ -272,11 +272,11 @@ static int Demux( demux_t *p_demux )
msg_Err
(
p_demux
,
"invalid XML (no enclosure markup)"
);
return
-
1
;
}
p_input
=
input_
I
temNewExt
(
p_demux
,
psz_item_mrl
,
p_input
=
input_
i
tem
_
NewExt
(
p_demux
,
psz_item_mrl
,
psz_item_name
,
0
,
NULL
,
-
1
);
if
(
p_input
==
NULL
)
break
;
#define ADD_INFO( info, field ) \
if( field ) { input_
I
temAddInfo( p_input, \
if( field ) { input_
i
tem
_
AddInfo( p_input, \
_( "Podcast Info" ), _( info ), "%s", field ); }
ADD_INFO
(
"Podcast Publication Date"
,
psz_item_date
);
ADD_INFO
(
"Podcast Author"
,
psz_item_author
);
...
...
@@ -288,13 +288,13 @@ static int Demux( demux_t *p_demux )
ADD_INFO
(
"Podcast Type"
,
psz_item_type
);
if
(
psz_item_size
)
{
input_
I
temAddInfo
(
p_input
,
input_
i
tem
_
AddInfo
(
p_input
,
_
(
"Podcast Info"
),
_
(
"Podcast Size"
),
"%s bytes"
,
psz_item_size
);
}
input_
I
temAddSubItem
(
p_current_input
,
p_input
);
input_
i
tem
_
AddSubItem
(
p_current_input
,
p_input
);
vlc_gc_decref
(
p_input
);
FREENULL
(
psz_item_name
);
FREENULL
(
psz_item_mrl
);
...
...
modules/demux/playlist/qtl.c
View file @
d11fd0d1
...
...
@@ -349,19 +349,19 @@ static int Demux( demux_t *p_demux )
}
else
{
p_input
=
input_
I
temNewExt
(
p_demux
,
p_input
=
input_
i
tem
_
NewExt
(
p_demux
,
psz_src
,
psz_moviename
,
0
,
NULL
,
-
1
);
#define SADD_INFO( type, field ) if( field ) { input_
I
temAddInfo( \
#define SADD_INFO( type, field ) if( field ) { input_
i
tem
_
AddInfo( \
p_input, "QuickTime Media Link", _(type), "%s", field ) ; }
SADD_INFO
(
"href"
,
psz_href
);
SADD_INFO
(
"mime type"
,
psz_mimetype
);
input_
I
temAddSubItem
(
p_current_input
,
p_input
);
input_
i
tem
_
AddSubItem
(
p_current_input
,
p_input
);
vlc_gc_decref
(
p_input
);
if
(
psz_qtnext
)
{
p_input
=
input_
I
temNewExt
(
p_demux
,
p_input
=
input_
i
tem
_
NewExt
(
p_demux
,
psz_qtnext
,
NULL
,
0
,
NULL
,
-
1
);
input_
I
temAddSubItem
(
p_current_input
,
p_input
);
input_
i
tem
_
AddSubItem
(
p_current_input
,
p_input
);
vlc_gc_decref
(
p_input
);
}
}
...
...
modules/demux/playlist/sgimb.c
View file @
d11fd0d1
...
...
@@ -353,7 +353,7 @@ static int Demux ( demux_t *p_demux )
p_sys
->
psz_uri
,
p_sys
->
i_sid
);
}
p_child
=
input_
I
temNewWithType
(
VLC_OBJECT
(
p_demux
),
p_sys
->
psz_uri
,
p_child
=
input_
i
tem
_
NewWithType
(
VLC_OBJECT
(
p_demux
),
p_sys
->
psz_uri
,
p_sys
->
psz_name
?
p_sys
->
psz_name
:
p_sys
->
psz_uri
,
0
,
NULL
,
p_sys
->
i_duration
,
ITEM_TYPE_NET
);
...
...
@@ -363,31 +363,31 @@ static int Demux ( demux_t *p_demux )
return
-
1
;
}
input_
I
temCopyOptions
(
p_current_input
,
p_child
);
input_
i
tem
_
CopyOptions
(
p_current_input
,
p_child
);
if
(
p_sys
->
i_packet_size
&&
p_sys
->
psz_mcast_ip
)
{
char
*
psz_option
;
p_sys
->
i_packet_size
+=
1000
;
asprintf
(
&
psz_option
,
"mtu=%i"
,
p_sys
->
i_packet_size
);
input_
I
temAddOption
(
p_child
,
psz_option
);
input_
i
tem
_
AddOption
(
p_child
,
psz_option
);
free
(
psz_option
);
}
if
(
!
p_sys
->
psz_mcast_ip
)
{
char
*
psz_option
;
asprintf
(
&
psz_option
,
"rtsp-caching=5000"
);
input_
I
temAddOption
(
p_child
,
psz_option
);
input_
i
tem
_
AddOption
(
p_child
,
psz_option
);
free
(
psz_option
);
}
if
(
!
p_sys
->
psz_mcast_ip
&&
p_sys
->
b_rtsp_kasenna
)
{
char
*
psz_option
;
asprintf
(
&
psz_option
,
"rtsp-kasenna"
);
input_
I
temAddOption
(
p_child
,
psz_option
);
input_
i
tem
_
AddOption
(
p_child
,
psz_option
);
free
(
psz_option
);
}
input_
I
temAddSubItem
(
p_current_input
,
p_child
);
input_
i
tem
_
AddSubItem
(
p_current_input
,
p_child
);
vlc_gc_decref
(
p_child
);
HANDLE_PLAY_AND_RELEASE
return
0
;
/* Needed for correct operation of go back */
...
...
modules/demux/playlist/shoutcast.c
View file @
d11fd0d1
...
...
@@ -228,12 +228,12 @@ static int DemuxGenre( demux_t *p_demux )
+
strlen
(
"?genre="
)
+
strlen
(
psz_name
)
+
1
);
sprintf
(
psz_mrl
,
SHOUTCAST_BASE_URL
"?genre=%s"
,
psz_name
);
p_input
=
input_
I
temNewExt
(
p_demux
,
psz_mrl
,
p_input
=
input_
i
tem
_
NewExt
(
p_demux
,
psz_mrl
,
psz_name
,
0
,
NULL
,
-
1
);
input_
I
temCopyOptions
(
p_sys
->
p_current_input
,
input_
i
tem
_
CopyOptions
(
p_sys
->
p_current_input
,
p_input
);
free
(
psz_mrl
);
input_
I
temAddSubItem
(
p_sys
->
p_current_input
,
p_input
);
input_
i
tem
_
AddSubItem
(
p_sys
->
p_current_input
,
p_input
);
vlc_gc_decref
(
p_input
);
FREENULL
(
psz_name
);
}
...
...
@@ -402,14 +402,14 @@ static int DemuxStation( demux_t *p_demux )
sprintf
(
psz_mrl
,
SHOUTCAST_TUNEIN_BASE_URL
"%s?id=%s"
,
psz_base
,
psz_id
);
}
p_input
=
input_
I
temNewExt
(
p_demux
,
psz_mrl
,
p_input
=
input_
i
tem
_
NewExt
(
p_demux
,
psz_mrl
,
psz_name
,
0
,
NULL
,
-
1
);
free
(
psz_mrl
);
input_
I
temCopyOptions
(
p_sys
->
p_current_input
,
input_
i
tem
_
CopyOptions
(
p_sys
->
p_current_input
,
p_input
);
#define SADD_INFO( type, field ) if( field ) { input_
I
temAddInfo( \
#define SADD_INFO( type, field ) if( field ) { input_
i
tem
_
AddInfo( \
p_input, _("Shoutcast"), _(type), "%s", field ) ; }
SADD_INFO
(
"Mime type"
,
psz_mt
);
SADD_INFO
(
"Bitrate"
,
psz_br
);
...
...
@@ -421,7 +421,7 @@ static int DemuxStation( demux_t *p_demux )
input_item_SetNowPlaying
(
p_input
,
psz_ct
);
if
(
psz_rt
)
input_item_SetRating
(
p_input
,
psz_rt
);
input_
I
temAddSubItem
(
p_sys
->
p_current_input
,
p_input
);
input_
i
tem
_
AddSubItem
(
p_sys
->
p_current_input
,
p_input
);
vlc_gc_decref
(
p_input
);
FREENULL
(
psz_name
);
FREENULL
(
psz_mt
);
...
...
Prev
1
2
3
Next
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