playlist: remove playlist_AskForArtEnqueue() (refs #5460)

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 10108cb2842b00126466353057cb8975dd825817..49edfc8f0504fb5bf1ba743ccd997599aa398a0a 100644 (file)
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -295,9 +295,6 @@ VLC_API void playlist_Clear( playlist_t *, bool );
 /** Enqueue an input item for preparsing */
 VLC_API int playlist_PreparseEnqueue(playlist_t *, input_item_t * );
 
-/** Request the art for an input item to be fetched */
-VLC_API int playlist_AskForArtEnqueue(playlist_t *, input_item_t * );
-
 /* Playlist sorting */
 VLC_API int playlist_TreeMove( playlist_t *, playlist_item_t *, playlist_item_t *, int );
 VLC_API int playlist_TreeMoveMany( playlist_t *, int, playlist_item_t **, playlist_item_t *, int );

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 134f5f48008f91ecd7d1c8ad51b0a1cde81bbd81..13d9e7a85fbe626dfea3589e22a11454a74bc79d 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -885,7 +885,7 @@
         p_item = [[o_outline_view itemAtRow: indexes[i]] pointerValue];
 
         if (p_item && p_item->i_children == -1)
-            playlist_AskForArtEnqueue(p_playlist, p_item->p_input);
+            libvlc_ArtRequest(p_intf->p_libvlc, p_item->p_input);
     }
     [self playlistUpdated];
 }

diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m
index 66bc75e477e2d05b549f12109b5ff91300d00c81..3cac0aff2fde5d7820e41efe1aee8a6b4a13f7d8 100644 (file)
--- a/modules/gui/macosx/playlistinfo.m
+++ b/modules/gui/macosx/playlistinfo.m
@@ -364,7 +364,7 @@ error:
 - (IBAction)downloadCoverArt:(id)sender
 {
     playlist_t * p_playlist = pl_Get(VLCIntf);
-    if (p_item) playlist_AskForArtEnqueue(p_playlist, p_item);
+    if (p_item) libvlc_ArtRequest(VLCIntf->p_libvlc, p_item);
 }
 
 - (input_item_t *)item

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 43526bda24044c04fa13b0d238c7c565ec8e0f09..bba154e86422ac46aca60f01855a2fc0a6b887fc 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -654,7 +654,7 @@ void InputManager::requestArtUpdate( input_item_t *p_item )
             if ( status & ( ITEM_ART_NOTFOUND|ITEM_ART_FETCHED ) )
                 return;
         }
-        playlist_AskForArtEnqueue( pl_Get(p_intf), p_item );
+        libvlc_ArtRequest( p_intf->p_libvlc, p_item );
         /* No input will signal the cover art to update,
              * let's do it ourself */
         if ( b_current_item )

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 200d1f28a0c0d2c434a89ea796ff66d7843ba80c..906b026e19e85d5294e287887493815a2105dfea 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -309,7 +309,6 @@ plane_CopyPixels
 playlist_Add
 playlist_AddExt
 playlist_AddInput
-playlist_AskForArtEnqueue
 playlist_AssertLocked
 playlist_ChildSearchName
 playlist_Clear

diff --git a/src/playlist/control.c b/src/playlist/control.c
index 7d6791bc45a04947777465f668fc226158b7f738..8b95e8480bf9367ae7be2c2a30d53f0a05eed0db 100644 (file)
--- a/src/playlist/control.c
+++ b/src/playlist/control.c
@@ -174,13 +174,3 @@ int playlist_PreparseEnqueue( playlist_t *p_playlist, input_item_t *p_item )
     playlist_preparser_Push( p_sys->p_preparser, p_item );
     return VLC_SUCCESS;
 }
-
-int playlist_AskForArtEnqueue( playlist_t *p_playlist, input_item_t *p_item )
-{
-    playlist_private_t *p_sys = pl_priv(p_playlist);
-
-    if( unlikely(p_sys->p_preparser == NULL) )
-        return VLC_ENOMEM;
-    playlist_preparser_fetcher_Push( p_sys->p_preparser, p_item );
-    return VLC_SUCCESS;
-}

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 594fb6b353c656380192812537dd51f91b5eea5b..ed1b80866b063df9e473c5955c993ea2b8b33ebb 100644 (file)
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -246,7 +246,7 @@ static int PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
         if( !b_has_art || strncmp( psz_arturl, "attachment://", 13 ) )
         {
             PL_DEBUG( "requesting art for %s", psz_name );
-            playlist_AskForArtEnqueue( p_playlist, p_input );
+            libvlc_ArtRequest( p_playlist->p_libvlc, p_input );
         }
         free( psz_arturl );
         free( psz_name );