Commit bd669141 authored by Thomas Guillem's avatar Thomas Guillem Committed by Jean-Baptiste Kempf

input: replace ITEM_TYPE_NET by ITEM_TYPE_STREAM

This type is set for streams (rtsp, httplive, mms...).
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent dc51ba02
......@@ -98,7 +98,7 @@ enum input_item_type_e
ITEM_TYPE_DISC,
ITEM_TYPE_CDDA,
ITEM_TYPE_CARD,
ITEM_TYPE_NET,
ITEM_TYPE_STREAM,
ITEM_TYPE_PLAYLIST,
ITEM_TYPE_NODE,
......
......@@ -374,7 +374,7 @@ static int Demux ( demux_t *p_demux )
p_child = input_item_NewWithType( p_sys->psz_uri,
p_sys->psz_name ? p_sys->psz_name : p_sys->psz_uri,
0, NULL, 0, p_sys->i_duration, ITEM_TYPE_NET );
0, NULL, 0, p_sys->i_duration, ITEM_TYPE_STREAM );
if( !p_child )
{
......
......@@ -395,7 +395,7 @@ DEPS_res = \
pixmaps/types/tape_16px.png \
pixmaps/types/type_directory.png \
pixmaps/types/type_file.png \
pixmaps/types/type_net.png \
pixmaps/types/type_stream.png \
pixmaps/types/type_node.png \
pixmaps/types/type_playlist.png \
pixmaps/types/type_unknown.xpm \
......
......@@ -57,7 +57,7 @@ VLCModel::VLCModel( intf_thread_t *_p_intf, QObject *parent )
ADD_ICON( DISC, ":/type/disc" );
ADD_ICON( CDDA, ":/type/cdda" );
ADD_ICON( CARD, ":/type/capture-card" );
ADD_ICON( NET, ":/type/net" );
ADD_ICON( STREAM, ":/type/stream" );
ADD_ICON( PLAYLIST, ":/type/playlist" );
ADD_ICON( NODE, ":/type/node" );
#undef ADD_ICON
......
......@@ -87,7 +87,7 @@
<file alias="network">pixmaps/types/network_16px.png</file>
<file alias="directory">pixmaps/types/type_directory.png</file>
<file alias="file">pixmaps/types/type_file.png</file>
<file alias="net">pixmaps/types/type_net.png</file>
<file alias="stream">pixmaps/types/type_stream.png</file>
<file alias="node">pixmaps/types/type_node.png</file>
<file alias="playlist">pixmaps/types/type_playlist.png</file>
</qresource>
......
......@@ -643,7 +643,7 @@ static int Demux( demux_t *p_demux )
vlc_mutex_lock( &p_parent_input->lock );
p_parent_input->i_type = ITEM_TYPE_NET;
p_parent_input->i_type = ITEM_TYPE_STREAM;
vlc_mutex_unlock( &p_parent_input->lock );
vlc_object_release( p_input );
......@@ -856,7 +856,7 @@ sap_announce_t *CreateAnnounce( services_discovery_t *p_sd, uint32_t *i_source,
/* Released in RemoveAnnounce */
p_input = input_item_NewWithType( p_sap->p_sdp->psz_uri,
p_sdp->psz_sessionname,
0, NULL, 0, -1, ITEM_TYPE_NET );
0, NULL, 0, -1, ITEM_TYPE_STREAM );
if( unlikely(p_input == NULL) )
{
free( p_sap );
......
......@@ -946,7 +946,7 @@ static int GuessType( const input_item_t *p_item )
{ "cdda", ITEM_TYPE_CDDA },
{ "cqam", ITEM_TYPE_CARD },
{ "dc1394", ITEM_TYPE_CARD },
{ "dccp", ITEM_TYPE_NET },
{ "dccp", ITEM_TYPE_STREAM },
{ "deckli", ITEM_TYPE_CARD }, /* decklink */
{ "dir", ITEM_TYPE_DIRECTORY },
{ "dshow", ITEM_TYPE_CARD },
......@@ -956,35 +956,35 @@ static int GuessType( const input_item_t *p_item )
{ "dtv", ITEM_TYPE_CARD },
{ "eyetv", ITEM_TYPE_CARD },
{ "fd", ITEM_TYPE_UNKNOWN },
{ "ftp", ITEM_TYPE_NET },
{ "http", ITEM_TYPE_NET },
{ "icyx", ITEM_TYPE_NET },
{ "ftp", ITEM_TYPE_STREAM },
{ "http", ITEM_TYPE_STREAM },
{ "icyx", ITEM_TYPE_STREAM },
{ "imem", ITEM_TYPE_UNKNOWN },
{ "itpc", ITEM_TYPE_NET },
{ "itpc", ITEM_TYPE_STREAM },
{ "jack", ITEM_TYPE_CARD },
{ "linsys", ITEM_TYPE_CARD },
{ "live", ITEM_TYPE_NET }, /* livedotcom */
{ "mms", ITEM_TYPE_NET },
{ "live", ITEM_TYPE_STREAM }, /* livedotcom */
{ "mms", ITEM_TYPE_STREAM },
{ "mtp", ITEM_TYPE_DISC },
{ "ofdm", ITEM_TYPE_CARD },
{ "oss", ITEM_TYPE_CARD },
{ "pnm", ITEM_TYPE_NET },
{ "pnm", ITEM_TYPE_STREAM },
{ "qam", ITEM_TYPE_CARD },
{ "qpsk", ITEM_TYPE_CARD },
{ "qtcapt", ITEM_TYPE_CARD }, /* qtcapture */
{ "raw139", ITEM_TYPE_CARD }, /* raw1394 */
{ "rt", ITEM_TYPE_NET }, /* rtp, rtsp, rtmp */
{ "rt", ITEM_TYPE_STREAM }, /* rtp, rtsp, rtmp */
{ "satell", ITEM_TYPE_CARD }, /* sattelite */
{ "screen", ITEM_TYPE_CARD },
{ "sdp", ITEM_TYPE_NET },
{ "sftp", ITEM_TYPE_NET },
{ "sdp", ITEM_TYPE_STREAM },
{ "sftp", ITEM_TYPE_STREAM },
{ "shm", ITEM_TYPE_CARD },
{ "smb", ITEM_TYPE_NET },
{ "smb", ITEM_TYPE_STREAM },
{ "svcd", ITEM_TYPE_DISC },
{ "tcp", ITEM_TYPE_NET },
{ "tcp", ITEM_TYPE_STREAM },
{ "terres", ITEM_TYPE_CARD }, /* terrestrial */
{ "udp", ITEM_TYPE_NET }, /* udplite too */
{ "unsv", ITEM_TYPE_NET },
{ "udp", ITEM_TYPE_STREAM }, /* udplite too */
{ "unsv", ITEM_TYPE_STREAM },
{ "usdigi", ITEM_TYPE_CARD }, /* usdigital */
{ "v4l", ITEM_TYPE_CARD },
{ "vcd", ITEM_TYPE_DISC },
......
......@@ -157,7 +157,7 @@ static void Preparse( vlc_object_t *obj, input_item_t *p_item,
case ITEM_TYPE_NODE:
b_preparse = true;
break;
case ITEM_TYPE_NET:
case ITEM_TYPE_STREAM:
if (i_options & META_REQUEST_OPTION_SCOPE_NETWORK)
b_preparse = true;
break;
......
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