playlist: remove playlist_PreparseEnqueue() (refs #5460)

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 49edfc8f0504fb5bf1ba743ccd997599aa398a0a..ad54147b988fbb443e375f6063736934d5a5c117 100644 (file)
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -292,9 +292,6 @@ VLC_API mtime_t playlist_GetNodeDuration( playlist_item_t * );
  */
 VLC_API void playlist_Clear( playlist_t *, bool );
 
-/** Enqueue an input item for preparsing */
-VLC_API int playlist_PreparseEnqueue(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 13d9e7a85fbe626dfea3589e22a11454a74bc79d..270b238974209ac5fb34a0d3e985b635809ebc46 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -860,7 +860,7 @@
 
         if (p_item) {
             if (p_item->i_children == -1)
-                playlist_PreparseEnqueue(p_playlist, p_item->p_input);
+                libvlc_MetaRequest(p_intf->p_libvlc, p_item->p_input);
             else
                 msg_Dbg(p_intf, "preparsing nodes not implemented");
         }

diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m
index 3cac0aff2fde5d7820e41efe1aee8a6b4a13f7d8..59e8d0c7de1627600b373ca283ae3931bae0e5af 100644 (file)
--- a/modules/gui/macosx/playlistinfo.m
+++ b/modules/gui/macosx/playlistinfo.m
@@ -212,7 +212,7 @@ static VLCInfo *_o_sharedInstance = nil;
         [o_image_well setImage: [NSImage imageNamed: @"noart.png"]];
     } else {
         if (!input_item_IsPreparsed(p_item))
-            playlist_PreparseEnqueue(pl_Get(VLCIntf), p_item);
+            libvlc_MetaRequest(VLCIntf->p_libvlc, p_item);
 
         /* fill uri info */
         char * psz_url = decode_URI(input_item_GetURI(p_item));

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 906b026e19e85d5294e287887493815a2105dfea..5a7c56a1ec84599064ebc3e860e755535694b92c 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -334,7 +334,6 @@ playlist_NodeCreate
 playlist_NodeDelete
 playlist_NodeInsert
 playlist_NodeRemoveItem
-playlist_PreparseEnqueue
 playlist_RecursiveNodeSort
 playlist_ServicesDiscoveryAdd
 playlist_ServicesDiscoveryControl

diff --git a/src/playlist/control.c b/src/playlist/control.c
index 8b95e8480bf9367ae7be2c2a30d53f0a05eed0db..e1be944224b1465543c70d45e5d835ffd5f89818 100644 (file)
--- a/src/playlist/control.c
+++ b/src/playlist/control.c
@@ -160,17 +160,3 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args
 
     return VLC_SUCCESS;
 }
-
-/*****************************************************************************
- * Preparse control
- *****************************************************************************/
-/** Enqueue an item for preparsing */
-int playlist_PreparseEnqueue( 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_Push( p_sys->p_preparser, p_item );
-    return VLC_SUCCESS;
-}

diff --git a/src/playlist/item.c b/src/playlist/item.c
index e902063224a6db6dd828aee94f2fb72c8cc349f9..b27389a160df7a2edc798a65807b0a1fe2ec9e7d 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -766,7 +766,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode,
         input_item_IsPreparsed( p_item->p_input ) == false &&
             ( EMPTY_STR( psz_artist ) || ( EMPTY_STR( psz_album ) ) )
           )
-        playlist_PreparseEnqueue( p_playlist, p_item->p_input );
+        libvlc_MetaRequest( p_playlist->p_libvlc, p_item->p_input );
     free( psz_artist );
     free( psz_album );
 }