Commit e62ab5fc authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove stray "album-art" variable usage

The variable value is always zero as of bdc3ad38. Simplify accordingly.
parent 5c36c934
......@@ -97,14 +97,6 @@ VLC_API void vlc_meta_SetStatus( vlc_meta_t *m, int status );
*/
VLC_API const char * vlc_meta_TypeToLocalizedString( vlc_meta_type_t meta_type );
/* deprecated (album-art variable) */
enum {
ALBUM_ART_WHEN_ASKED,
ALBUM_ART_WHEN_PLAYED,
ALBUM_ART_ALL
};
typedef struct meta_export_t
{
VLC_COMMON_MEMBERS
......
......@@ -259,8 +259,7 @@ struct access_sys_t
#ifdef HAVE_LIBCDDB
static cddb_disc_t *GetCDDBInfo( vlc_object_t *obj, int i_titles, int *p_sectors )
{
if( var_InheritInteger( obj, "album-art" ) != ALBUM_ART_ALL &&
!var_InheritBool( obj, "metadata-network-access" ) )
if( !var_InheritBool( obj, "metadata-network-access" ) )
{
msg_Dbg( obj, "album art policy set to manual: not fetching" );
return NULL;
......
......@@ -196,9 +196,8 @@ void VLCModel::ensureArtRequested( const QModelIndex &index )
{
if ( index.isValid() && hasChildren( index ) )
{
int i_art_policy = var_GetInteger( THEPL, "album-art" );
bool b_access = var_InheritBool( THEPL, "metadata-network-access" );
if ( i_art_policy != ALBUM_ART_ALL && ! b_access ) return;
if ( !b_access ) return;
int nbnodes = rowCount( index );
QModelIndex child;
for( int row = 0 ; row < nbnodes ; row++ )
......
......@@ -37,9 +37,6 @@ FirstRun::FirstRun( QWidget *_p, intf_thread_t *_p_intf )
setVisible( true );
}
#define ALBUM_ART_WHEN_ASKED 0
#define ALBUM_ART_ALL 2
void FirstRun::save()
{
config_PutInt( p_intf, "metadata-network-access", checkbox->isChecked() );
......
......@@ -466,7 +466,6 @@ static void VariablesInit( playlist_t *p_playlist )
var_Create( p_playlist, "demux-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
/* */
var_Create( p_playlist, "album-art", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_playlist, "metadata-network-access", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
/* Variables to preserve video output parameters */
......
......@@ -108,11 +108,10 @@ playlist_fetcher_t *playlist_fetcher_New( vlc_object_t *parent )
vlc_cond_init( &p_fetcher->wait );
p_fetcher->b_live = false;
bool b_access = var_InheritBool( parent, "metadata-network-access" );
if ( !b_access )
b_access = ( var_InheritInteger( parent, "album-art" ) == ALBUM_ART_ALL );
p_fetcher->e_scope = ( b_access ) ? FETCHER_SCOPE_ANY : FETCHER_SCOPE_LOCAL;
if( var_InheritBool( parent, "metadata-network-access" ) )
p_fetcher->e_scope = FETCHER_SCOPE_ANY;
else
p_fetcher->e_scope = FETCHER_SCOPE_LOCAL;
memset( p_fetcher->p_waiting_head, 0, PASS_COUNT * sizeof(fetcher_entry_t *) );
memset( p_fetcher->p_waiting_tail, 0, PASS_COUNT * sizeof(fetcher_entry_t *) );
......
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