Changeset 9c9d1dddbaadcc675ba5e402ae12a0c1698bc442

Show
Ignore:
Timestamp:
11/07/07 22:21:46 (10 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1194470506 +0000
git-parent:

[014ff1d36a37ba5761df307da63c96df0a99fad4]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1194470506 +0000
Message:

playlist: Add an option to disable meta-fetch. (Need to be merged with art-fetch).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/libvlc-module.c

    r00ee7f7 r9c9d1dd  
    10651065    "Automatically preparse files added to the playlist " \ 
    10661066    "(to retrieve some metadata)." ) 
     1067 
     1068#define FETCH_META_TEXT N_( "Meta fetcher policy" ) 
     1069#define FETCH_META_LONGTEXT N_( \ 
     1070    "Specify if you want to attempt to fetch files'"\ 
     1071    "meta informations using the network." ); 
    10671072 
    10681073#define ALBUM_ART_TEXT N_( "Album art policy" ) 
     
    18511856    add_bool( "auto-preparse", VLC_TRUE, NULL, PREPARSE_TEXT, 
    18521857              PREPARSE_LONGTEXT, VLC_FALSE ); 
     1858 
     1859    add_integer( "fetch-meta", VLC_TRUE, NULL, FETCH_META_TEXT, 
     1860                 FETCH_META_LONGTEXT, VLC_FALSE ); 
    18531861 
    18541862    add_integer( "album-art", ALBUM_ART_WHEN_ASKED, NULL, ALBUM_ART_TEXT, 
  • src/playlist/engine.c

    rf452c11 r9c9d1dd  
    591591            if( !b_fetch_art ) 
    592592            { 
    593                 input_MetaFetch( p_playlist, p_item ); 
    594                 var_SetInteger( p_playlist, "item-change", p_item->i_id ); 
     593                /* If the user doesn't want us to fetch meta automatically  
     594                 * abort here. */ 
     595                if( p_playlist->p_fetcher->b_fetch_meta ) 
     596                { 
     597                    input_MetaFetch( p_playlist, p_item ); 
     598                    var_SetInteger( p_playlist, "item-change", p_item->i_id ); 
     599                } 
     600 
    595601                /*  Fetch right now */ 
    596602                if( p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL ) 
  • src/playlist/playlist_internal.h

    r62ffefd r9c9d1dd  
    5656    vlc_mutex_t     lock; 
    5757    int             i_art_policy; 
     58    vlc_bool_t      b_fetch_meta; 
    5859    int             i_waiting; 
    5960    preparse_item_t *p_waiting; 
  • src/playlist/thread.c

    r248d9c5 r9c9d1dd  
    9898    p_playlist->p_fetcher->i_waiting = 0; 
    9999    p_playlist->p_fetcher->p_waiting = NULL; 
     100    p_playlist->p_fetcher->b_fetch_meta = var_CreateGetInteger( p_playlist, 
     101                                                                 "meta-fetch" ); 
    100102    p_playlist->p_fetcher->i_art_policy = var_CreateGetInteger( p_playlist, 
    101103                                                                "album-art" );