videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

input_item: move META_REQUEST_OPTION NO_SKIP to SCOPE_FORCED 

SCOPE_* enums are for the preparser (not for the fetcher) and this
option only touches the preparser.
This commit is contained in:
Thomas Guillem 2023-03-31 11:36:55 +02:00
parent 5d2278c406
commit 5a6942ebe9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/vlc_input_item.h
View File

@ -480,12 +480,12 @@ typedef enum input_item_meta_request_option_t
META_REQUEST_OPTION_SCOPE_NETWORK = 0x02,
META_REQUEST_OPTION_SCOPE_ANY =
META_REQUEST_OPTION_SCOPE_LOCAL|META_REQUEST_OPTION_SCOPE_NETWORK,
META_REQUEST_OPTION_FETCH_LOCAL = 0x04,
META_REQUEST_OPTION_FETCH_NETWORK = 0x08,
META_REQUEST_OPTION_SCOPE_FORCED = 0x04,
META_REQUEST_OPTION_FETCH_LOCAL = 0x08,
META_REQUEST_OPTION_FETCH_NETWORK = 0x10,
META_REQUEST_OPTION_FETCH_ANY =
META_REQUEST_OPTION_FETCH_LOCAL|META_REQUEST_OPTION_FETCH_NETWORK,
META_REQUEST_OPTION_DO_INTERACT = 0x10,
META_REQUEST_OPTION_NO_SKIP = 0x20,
META_REQUEST_OPTION_DO_INTERACT = 0x20,
} input_item_meta_request_option_t;
/* status of the on_preparse_ended() callback */

2
lib/media.c
View File

@ -864,7 +864,7 @@ int libvlc_media_parse_request(libvlc_instance_t *inst, libvlc_media_t *media,
if (parse_flag & libvlc_media_do_interact)
parse_scope |= META_REQUEST_OPTION_DO_INTERACT;
if (parse_flag & libvlc_media_no_skip)
parse_scope |= META_REQUEST_OPTION_NO_SKIP;
parse_scope |= META_REQUEST_OPTION_SCOPE_FORCED;
ret = libvlc_MetadataRequest(libvlc, item, parse_scope,
&input_preparser_callbacks, media,

2
src/preparser/preparser.c
View File

@ -323,7 +323,7 @@ int input_preparser_Push( input_preparser_t *preparser,
item->b_preparse_interact = true;
vlc_mutex_unlock( &item->lock );
if (!(i_options & META_REQUEST_OPTION_NO_SKIP))
if (!(i_options & META_REQUEST_OPTION_SCOPE_FORCED))
{
switch( i_type )
{