input: replace ITEM_TYPE_NET by ITEM_TYPE_STREAM

[vlc] / modules / gui / qt4 / components / playlist / vlc_model.cpp

diff --git a/modules/gui/qt4/components/playlist/vlc_model.cpp b/modules/gui/qt4/components/playlist/vlc_model.cpp
index 43f4fcc95907af7b2dbf814d85d2f6ba631229d3..40465a2d4a9607433e818bd2f873677a3f9ad129 100644 (file)
--- a/modules/gui/qt4/components/playlist/vlc_model.cpp
+++ b/modules/gui/qt4/components/playlist/vlc_model.cpp
@@ -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
@@ -198,14 +198,15 @@ void VLCModel::ensureArtRequested( const QModelIndex &index )
     if ( index.isValid() && hasChildren( index ) )
     {
         int i_art_policy = var_GetInteger( THEPL, "album-art" );
-        if ( i_art_policy != ALBUM_ART_ALL ) return;
+        bool b_access = var_InheritBool( THEPL, "metadata-network-access" );
+        if ( i_art_policy != ALBUM_ART_ALL && ! b_access ) return;
         int nbnodes = rowCount( index );
         QModelIndex child;
         for( int row = 0 ; row < nbnodes ; row++ )
         {
             child = index.child( row, COLUMN_COVER );
             if ( child.isValid() && child.data().toString().isEmpty() )
-                THEMIM->getIM()->requestArtUpdate( getInputItem( child ) );
+                THEMIM->getIM()->requestArtUpdate( getInputItem( child ), false );
         }
     }
 }