core: remove media library support

configure.ac

@@ -3959,17 +3959,6 @@ dnl Libnotify notification plugin
 dnl
 PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify gtk+-2.0], [libnotify notification], [auto])
 
-dnl
-dnl media library
-dnl
-AC_ARG_ENABLE(media-library,
-    [  --enable-media-library  media library (default disabled)])
-AS_IF([test "${enable_media_library}" = "yes"], [
-  AC_DEFINE([MEDIA_LIBRARY], 1, [Define if you want to use the VLC media library])
-  VLC_ADD_CPPFLAGS([qt4],"-DMEDIA_LIBRARY")
-])
-
-
 dnl
 dnl  Endianness check
 dnl

src/Makefile.am

@@ -461,7 +461,6 @@ SOURCES_libvlc_common = \
 	misc/update.c \
 	misc/update_crypto.c \
 	misc/xml.c \
-	misc/media_library.c \
 	extras/libc.c \
 	extras/tdestroy.c \
 	misc/filter.c \

src/libvlc-module.c

@@ -2033,10 +2033,6 @@ vlc_module_begin ()
               PLAYLISTENQUEUE_LONGTEXT, true )
 #endif
     add_bool( "media-library", 0, ML_TEXT, ML_LONGTEXT, false )
-#if defined( MEDIA_LIBRARY )
-    add_bool( "load-media-library-on-startup", 1, LOAD_ML_TEXT,
-            LOAD_ML_LONGTEXT, false )
-#endif
     add_bool( "playlist-tree", 0, PLTREE_TEXT, PLTREE_LONGTEXT, false )
 
     add_string( "open", "", OPEN_TEXT, OPEN_LONGTEXT, false )

src/libvlc.c

@@ -55,7 +55,6 @@
 #endif
 
 
-#include <vlc_media_library.h>
 #include <vlc_playlist.h>
 #include <vlc_interface.h>
 
@@ -109,12 +108,9 @@ libvlc_int_t * libvlc_InternalCreate( void )
 
     priv = libvlc_priv (p_libvlc);
     priv->p_playlist = NULL;
-    priv->p_ml = NULL;
     priv->p_dialog_provider = NULL;
     priv->p_vlm = NULL;
 
-    /* Initialize mutexes */
-    vlc_mutex_init( &priv->ml_lock );
     vlc_ExitInit( &priv->exit );
 
     return p_libvlc;
@@ -395,23 +391,6 @@ dbus_out:
     /* System specific configuration */
     system_Configure( p_libvlc, i_argc - vlc_optind, ppsz_argv + vlc_optind );
 
-#if defined(MEDIA_LIBRARY)
-    /* Get the ML */
-    if( var_GetBool( p_libvlc, "load-media-library-on-startup" ) )
-    {
-        priv->p_ml = ml_Create( VLC_OBJECT( p_libvlc ), NULL );
-        if( !priv->p_ml )
-        {
-            msg_Err( p_libvlc, "ML initialization failed" );
-            return VLC_EGENERIC;
-        }
-    }
-    else
-    {
-        priv->p_ml = NULL;
-    }
-#endif
-
 #ifdef ENABLE_VLM
     /* Initialize VLM if vlm-conf is specified */
     psz_parser = var_CreateGetNonEmptyString( p_libvlc, "vlm-conf" );
@@ -551,16 +530,6 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
     }
 #endif
 
-#if defined(MEDIA_LIBRARY)
-    media_library_t* p_ml = priv->p_ml;
-    if( p_ml )
-    {
-        ml_Destroy( VLC_OBJECT( p_ml ) );
-        vlc_object_release( p_ml );
-        libvlc_priv(p_playlist->p_libvlc)->p_ml = NULL;
-    }
-#endif
-
     /* Free playlist now, all threads are gone */
     playlist_t *p_playlist = libvlc_priv (p_libvlc)->p_playlist;
     if( p_playlist != NULL )
@@ -612,9 +581,7 @@ void libvlc_InternalDestroy( libvlc_int_t *p_libvlc )
 {
     libvlc_priv_t *priv = libvlc_priv( p_libvlc );
 
-    /* Destroy mutexes */
     vlc_ExitDestroy( &priv->exit );
-    vlc_mutex_destroy( &priv->ml_lock );
 
     assert( atomic_load(&(vlc_internals(p_libvlc)->refs)) == 1 );
     vlc_object_release( p_libvlc );

src/libvlc.h

@@ -159,8 +159,6 @@ typedef struct libvlc_priv_t
 
     /* Singleton objects */
     playlist_t        *p_playlist; ///< the playlist singleton
-    struct media_library_t *p_ml;    ///< the ML singleton
-    vlc_mutex_t       ml_lock; ///< Mutex for ML creation
     vlm_t             *p_vlm;  ///< the VLM singleton (or NULL)
     vlc_object_t      *p_dialog_provider; ///< dialog provider
 #ifdef ENABLE_SOUT

src/libvlccore.sym

@@ -230,13 +230,7 @@ vlc_UrlClean
 vlc_path2uri
 make_path
 mdate
-ml_Get
 media_New
-ml_OpConnectChilds
-ml_FtreeSpec
-ml_UpdateSimple
-ml_GetPersonsFromMedia
-ml_DeletePersonTypeFromMedia
 module_config_free
 module_config_get
 module_exists

src/missing.c

@@ -368,74 +368,3 @@ vlm_t *vlm_New (vlc_object_t *obj)
      return NULL;
 }
 #endif /* !ENABLE_VLM */
-
-#ifndef MEDIA_LIBRARY
-#include<vlc_media_library.h>
-
-#undef ml_Get
-media_library_t* ml_Get ( vlc_object_t* p_this )
-{
-    VLC_UNUSED( p_this );
-    return NULL;
-}
-
-ml_media_t* media_New( media_library_t* p_ml, int id, ml_select_e select, bool reload )
-{
-    VLC_UNUSED( p_ml );
-    VLC_UNUSED( id );
-    VLC_UNUSED( select );
-    VLC_UNUSED( reload );
-    assert( 0 );
-    return NULL;
-}
-
-#undef ml_UpdateSimple
-int ml_UpdateSimple( media_library_t *p_media_library, ml_select_e selected_type,
-                                     const char* psz_lvalue, int id, ... )
-{
-    VLC_UNUSED( p_media_library );
-    VLC_UNUSED( selected_type );
-    VLC_UNUSED( psz_lvalue );
-    VLC_UNUSED( id );
-    assert( 0 );
-    return 0;
-}
-
-ml_ftree_t* ml_OpConnectChilds( ml_op_e op, ml_ftree_t* left, ml_ftree_t* right )
-{
-    VLC_UNUSED( op );
-    VLC_UNUSED( left );
-    VLC_UNUSED( right );
-    assert( 0 );
-    return NULL;
-}
-
-ml_ftree_t* ml_FtreeSpec( ml_ftree_t* tree, ml_select_e crit, int limit,
-                                          char* sort )
-{
-    VLC_UNUSED( tree );
-    VLC_UNUSED( crit );
-    VLC_UNUSED( limit );
-    VLC_UNUSED( sort );
-    assert( 0 );
-    return NULL;
-}
-
-void ml_DeletePersonTypeFromMedia( ml_media_t* p_media, const char *psz_role )
-{
-    VLC_UNUSED( p_media );
-    VLC_UNUSED( psz_role );
-    assert( 0 );
-}
-
-ml_person_t*  ml_GetPersonsFromMedia( media_library_t* p_ml,
-                                                    ml_media_t* p_media,
-                                                    const char *psz_role )
-{
-    VLC_UNUSED( p_ml );
-    VLC_UNUSED( p_media );
-    VLC_UNUSED( psz_role );
-    assert( 0 );
-    return NULL;
-}
-#endif /* !MEDIA_LIBRARY */