vlc | branch: master | Thomas Guillem <[email protected]> | Sat Jun 4 17:05:21 2016 +0200| [7658154c35f7eb06079420b8a0fa3b63d48ea1ef] | committer: Thomas Guillem
input: b_quick is b_preparsing > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7658154c35f7eb06079420b8a0fa3b63d48ea1ef --- src/input/demux.c | 12 ++++++------ src/input/input.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/input/demux.c b/src/input/demux.c index 303c0b8..49b7fbc 100644 --- a/src/input/demux.c +++ b/src/input/demux.c @@ -95,7 +95,7 @@ demux_t *demux_New( vlc_object_t *p_obj, const char *psz_name, demux_t *demux_NewAdvanced( vlc_object_t *p_obj, input_thread_t *p_parent_input, const char *psz_access, const char *psz_demux, const char *psz_location, - stream_t *s, es_out_t *out, bool b_quick ) + stream_t *s, es_out_t *out, bool b_preparsing ) { demux_t *p_demux = vlc_custom_create( p_obj, sizeof( *p_demux ), "demux" ); if( unlikely(p_demux == NULL) ) @@ -122,7 +122,7 @@ demux_t *demux_NewAdvanced( vlc_object_t *p_obj, input_thread_t *p_parent_input, || p_demux->psz_location == NULL) ) goto error; - if( !b_quick ) + if( !b_preparsing ) msg_Dbg( p_obj, "creating demux: access='%s' demux='%s' " "location='%s' file='%s'", p_demux->psz_access, p_demux->psz_demux, @@ -186,7 +186,7 @@ demux_t *demux_NewAdvanced( vlc_object_t *p_obj, input_thread_t *p_parent_input, { psz_ext++; // skip '.' - if( !b_quick ) + if( !b_preparsing ) { for( unsigned i = 0; exttodemux[i].ext[0]; i++ ) { @@ -242,7 +242,7 @@ error: demux_t *input_DemuxNew( vlc_object_t *obj, const char *access_name, const char *demux_name, const char *path, - es_out_t *out, bool quick, input_thread_t *input ) + es_out_t *out, bool preparsing, input_thread_t *input ) { char *demux_var = NULL; @@ -266,7 +266,7 @@ demux_t *input_DemuxNew( vlc_object_t *obj, const char *access_name, demux_t *demux = NULL; - if( quick ) + if( preparsing ) { if( strcasecmp( demux_name, "any" ) ) goto out; @@ -323,7 +323,7 @@ demux_t *input_DemuxNew( vlc_object_t *obj, const char *access_name, } demux = demux_NewAdvanced( obj, input, access_name, demux_name, path, - stream, out, quick ); + stream, out, preparsing ); if( demux == NULL ) { msg_Err( obj, "cannot parse %s://%s", access_name, path ); diff --git a/src/input/input.c b/src/input/input.c index 7d2feb3..afd40d0 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -273,7 +273,7 @@ input_item_t *input_GetItem( input_thread_t *p_input ) * XXX Do not forget to update vlc_input.h if you add new variables. *****************************************************************************/ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, - const char *psz_header, bool b_quick, + const char *psz_header, bool b_preparsing, input_resource_t *p_resource ) { input_thread_t *p_input = NULL; /* thread descriptor */ @@ -289,7 +289,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, snprintf( psz_timer_name, sizeof(psz_timer_name), "input launching for '%s'", psz_name ); - msg_Dbg( p_input, "Creating an input for %s'%s'", b_quick ? "preparsing " : "", psz_name); + msg_Dbg( p_input, "Creating an input for %s'%s'", b_preparsing ? "preparsing " : "", psz_name); free( psz_name ); @@ -303,7 +303,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, /* Parse input options */ input_item_ApplyOptions( VLC_OBJECT(p_input), p_item ); - p_input->b_preparsing = b_quick; + p_input->b_preparsing = b_preparsing; p_input->psz_header = psz_header ? strdup( psz_header ) : NULL; /* Init Common fields */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
