Commit d6f04ffa authored by gbazin's avatar gbazin

* src/libvlc.h: updated useage.

* src/input/input.c: hack for udp access and MRLSections().
parent 25d2a663
...@@ -1530,6 +1530,12 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -1530,6 +1530,12 @@ static int InputSourceInit( input_thread_t *p_input,
msg_Dbg( p_input, "`%s' gives access `%s' demux `%s' path `%s'", msg_Dbg( p_input, "`%s' gives access `%s' demux `%s' path `%s'",
psz_mrl, psz_access, psz_demux, psz_path ); psz_mrl, psz_access, psz_demux, psz_path );
if( !psz_access ||
( strcmp( psz_access, "udp" ) && strcmp( psz_access, "udpstream" ) &&
strcmp( psz_access, "udp4" ) && strcmp( psz_access, "udp6" ) &&
strcmp( psz_access, "rtp" ) && strcmp( psz_access, "rtp4" ) &&
strcmp( psz_access, "rtp6" ) ) ) // FIXME
/* Find optional titles and seekpoints */ /* Find optional titles and seekpoints */
MRLSections( p_input, psz_path, &in->i_title_start, &in->i_title_end, MRLSections( p_input, psz_path, &in->i_title_start, &in->i_title_end,
&in->i_seekpoint_start, &in->i_seekpoint_end ); &in->i_seekpoint_start, &in->i_seekpoint_end );
......
...@@ -727,18 +727,20 @@ static char *ppsz_align_descriptions[] = ...@@ -727,18 +727,20 @@ static char *ppsz_align_descriptions[] =
#define SUBTITLE_TRACK_KEY_TEXT N_("Cycle subtitle track") #define SUBTITLE_TRACK_KEY_TEXT N_("Cycle subtitle track")
#define SUBTITLE_TRACK_KEY_LONGTEXT N_("Cycle through the available subtitle tracks") #define SUBTITLE_TRACK_KEY_LONGTEXT N_("Cycle through the available subtitle tracks")
#define PLAYLIST_USAGE N_("\nPlaylist items:" \ #define PLAYLIST_USAGE N_( \
"\n *.mpg, *.vob plain MPEG-1/2 files" \ "\nPlaylist item syntax:" \
"\n [dvd://][device][@raw_device][@[title][,[chapter][,angle]]]" \ "\n MRL [:option=value]" \
"\n DVD device" \ "\nMRL syntax:" \
"\n [vcd://][device][@{S|T|E|P}[number]]" \ "\n URL[@[title-start][,chapter-start][-[title-end][,chapter-end]]]" \
"\n VCD device" \ "\nURL syntax:" \
"\n [cdda://][device][@[T][track-number]]" \ "\n [file://]filename plain media file" \
"\n Audio CD device" \ "\n http://ip:port/file HTTP url" \
"\n udpstream:[[<source address>]@[<bind address>][:<bind port>]]" \ "\n [dvd://][device][@raw_device] DVD device" \
"\n UDP stream sent by a streaming server" \ "\n [vcd://][device] VCD device" \
"\n vlc:pause pause execution of " \ "\n [cdda://][device] Audio CD device" \
"playlist items" \ "\n udp:[[<source address>]@[<bind address>][:<bind port>]]" \
"\n UDP stream sent by a streaming server"\
"\n vlc:pause pause execution of playlist items" \
"\n vlc:quit quit VLC" \ "\n vlc:quit quit VLC" \
"\n") "\n")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment