LibVLC: remove unused and buggy media list views

include/vlc/libvlc_events.h

@@ -204,28 +204,6 @@ struct libvlc_event_t
             int index;
         } media_list_will_delete_item;
 
-        /* media list view */
-        struct
-        {
-            libvlc_media_t * item;
-            int index;
-        } media_list_view_item_added;
-        struct
-        {
-            libvlc_media_t * item;
-            int index;
-        } media_list_view_will_add_item;
-        struct
-        {
-            libvlc_media_t * item;
-            int index;
-        } media_list_view_item_deleted;
-        struct
-        {
-            libvlc_media_t * item;
-            int index;
-        } media_list_view_will_delete_item;
-
         /* media list player */
         struct
         {

include/vlc/libvlc_media_list_view.h

-/*****************************************************************************
- * libvlc_media_list.h:  libvlc_media_list API
- *****************************************************************************
- * Copyright (C) 1998-2008 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef LIBVLC_MEDIA_LIST_VIEW_H
-#define LIBVLC_MEDIA_LIST_VIEW_H 1
-
-/**
- * \file
- * This file defines libvlc_media_list API
- */
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-/*****************************************************************************
- * Media List View
- *****************************************************************************/
-/** \defgroup libvlc_media_list_view libvlc_media_list_view
- * \ingroup libvlc
- * LibVLC Media List View: represents a media_list using a different layout.
- * The layout can be a flat one without hierarchy, a hierarchical one.
- *
- * Other type of layout, such as orderer media_list layout could be implemented
- * with this class.
- * @{ */
-
-/**
- * Retain reference to a media list view
- *
- * \param p_mlv a media list view created with libvlc_media_list_view_new()
- */
-VLC_PUBLIC_API void
-    libvlc_media_list_view_retain( libvlc_media_list_view_t * p_mlv );
-
-/**
- * Release reference to a media list view. If the refcount reaches 0, then
- * the object will be released.
- *
- * \param p_mlv a media list view created with libvlc_media_list_view_new()
- */
-VLC_PUBLIC_API void
-    libvlc_media_list_view_release( libvlc_media_list_view_t * p_mlv );
-
-/**
- * Get libvlc_event_manager from this media list view instance.
- * The p_event_manager is immutable, so you don't have to hold the lock
- *
- * \param p_mlv a media list view instance
- * \return libvlc_event_manager
- */
-VLC_PUBLIC_API libvlc_event_manager_t *
-    libvlc_media_list_view_event_manager( libvlc_media_list_view_t * p_mlv );
-
-/**
- * Get count on media list view items
- *
- * \param p_mlv a media list view instance
- * \param p_e initialized exception object
- * \return number of items in media list view
- */
-VLC_PUBLIC_API int
-    libvlc_media_list_view_count(  libvlc_media_list_view_t * p_mlv,
-                                   libvlc_exception_t * p_e );
-
-/**
- * List media instance in media list view at an index position
- *
- * \param p_mlv a media list view instance
- * \param i_index index position in array where to insert
- * \param p_e initialized exception object
- * \return media instance at position i_pos and libvlc_media_retain() has been called to increase the refcount on this object.
- */
-VLC_PUBLIC_API libvlc_media_t *
-    libvlc_media_list_view_item_at_index(  libvlc_media_list_view_t * p_mlv,
-                                           int i_index,
-                                           libvlc_exception_t * p_e );
-
-VLC_PUBLIC_API libvlc_media_list_view_t *
-    libvlc_media_list_view_children_at_index(  libvlc_media_list_view_t * p_mlv,
-                                           int index,
-                                           libvlc_exception_t * p_e );
-
-VLC_PUBLIC_API libvlc_media_list_view_t *
-    libvlc_media_list_view_children_for_item(  libvlc_media_list_view_t * p_mlv,
-                                           libvlc_media_t * p_md,
-                                           libvlc_exception_t * p_e );
-
-VLC_PUBLIC_API libvlc_media_list_t *
-    libvlc_media_list_view_parent_media_list(  libvlc_media_list_view_t * p_mlv,
-                                               libvlc_exception_t * p_e );
-
-/** @} media_list_view */
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif /* LIBVLC_MEDIA_LIST_VIEW_H */

include/vlc/vlc.h

@@ -42,7 +42,6 @@ extern "C" {
 #include <vlc/libvlc_media.h>
 #include <vlc/libvlc_media_player.h>
 #include <vlc/libvlc_media_list.h>
-#include <vlc/libvlc_media_list_view.h>
 #include <vlc/libvlc_media_list_player.h>
 #include <vlc/libvlc_media_library.h>
 #include <vlc/libvlc_media_discoverer.h>

po/POTFILES.in

@@ -84,9 +84,6 @@ src/config/intf.c
 src/control/audio.c
 src/control/core.c
 src/control/event.c
-src/control/flat_media_list_view.c
-src/control/hierarchical_media_list_view.c
-src/control/hierarchical_node_media_list_view.c
 src/control/libvlc_internal.h
 src/control/log.c
 src/control/media.c
@@ -99,7 +96,6 @@ src/control/media_library.c
 src/control/media_list.c
 src/control/media_list_path.h
 src/control/media_list_player.c
-src/control/media_list_view.c
 src/control/media_player.c
 src/control/playlist.c
 src/control/video.c

src/Makefile.am

@@ -34,7 +34,6 @@ pkginclude_HEADERS = \
 	../include/vlc/libvlc_media_library.h \
 	../include/vlc/libvlc_media_list.h \
 	../include/vlc/libvlc_media_list_player.h \
-	../include/vlc/libvlc_media_list_view.h \
 	../include/vlc/libvlc_media_player.h \
 	../include/vlc/libvlc_structures.h \
 	../include/vlc/libvlc_vlm.h \
@@ -492,7 +491,6 @@ SOURCES_libvlc_control = \
 	control/event_internal.h \
 	control/media_internal.h \
 	control/media_list_internal.h \
-	control/media_list_view_internal.h \
 	control/media_player_internal.h \
 	control/core.c \
 	control/error.c \
@@ -503,15 +501,11 @@ SOURCES_libvlc_control = \
 	control/audio.c \
 	control/event.c \
 	control/event_async.c \
-	control/flat_media_list_view.c \
-	control/hierarchical_media_list_view.c \
-	control/hierarchical_node_media_list_view.c \
 	control/media.c \
 	control/media_player.c \
 	control/media_list.c \
 	control/media_list_path.h \
 	control/media_list_player.c \
-	control/media_list_view.c \
 	control/media_library.c \
 	control/mediacontrol_internal.h \
 	control/mediacontrol_core.c \

src/control/flat_media_list_view.c

-/*****************************************************************************
- * flat_media_list_view.c: libvlc flat media list view functions.
- *****************************************************************************
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <assert.h>
-
-#include <vlc/libvlc.h>
-#include <vlc/libvlc_media.h>
-#include <vlc/libvlc_media_list.h>
-#include <vlc/libvlc_media_list_view.h>
-
-#include "media_list_view_internal.h"
-
-
-//#define DEBUG_FLAT_VIEW
-
-#ifdef DEBUG_FLAT_VIEW
-# define trace( fmt, ... ) printf( "%s(): " fmt, __FUNCTION__, ##__VA_ARGS__ )
-#else
-# define trace( ... )
-#endif
-
-struct libvlc_media_list_view_private_t
-{
-    vlc_array_t array;
-};
-
-/*
- * Private functions
- */
-
-/**************************************************************************
- *       ml_item_added  (private) (Callback from media_list_view item_added)
- **************************************************************************/
-static void
-ml_item_added( const libvlc_event_t * p_event, libvlc_media_list_view_t * p_mlv )
-{
-    int index = vlc_array_count( &p_mlv->p_this_view_data->array );
-    libvlc_media_t * p_md = p_event->u.media_list_item_added.item;
-    libvlc_media_retain( p_md );
-    trace("appending item at index %d\n", index);
-
-    libvlc_media_list_view_will_add_item( p_mlv, p_md, index );
-    vlc_array_append( &p_mlv->p_this_view_data->array, p_md );
-    libvlc_media_list_view_item_added( p_mlv, p_md, index );
-}
-
-/**************************************************************************
- *       ml_item_removed  (private) (Callback from media_list_view)
- **************************************************************************/
-static void
-ml_item_removed( const libvlc_event_t * p_event, libvlc_media_list_view_t * p_mlv )
-{
-    libvlc_media_t * p_md = p_event->u.media_list_item_deleted.item;
-    int i = vlc_array_index_of_item( &p_mlv->p_this_view_data->array, p_md );
-    if( i >= 0 )
-    {
-        libvlc_media_list_view_will_delete_item( p_mlv, p_md, i );
-        vlc_array_remove( &p_mlv->p_this_view_data->array, i );
-        libvlc_media_list_view_item_deleted( p_mlv, p_md, i );
-        libvlc_media_release( p_md );
-    }
-}
-
-/**************************************************************************
- *       flat_media_list_view_count  (private)
- * (called by media_list_view_count)
- **************************************************************************/
-static int
-flat_media_list_view_count( libvlc_media_list_view_t * p_mlv,
-                            libvlc_exception_t * p_e )
-{
-    (void)p_e;
-    return vlc_array_count( &p_mlv->p_this_view_data->array );
-}
-
-/**************************************************************************
- *       flat_media_list_view_item_at_index  (private)
- * (called by flat_media_list_view_item_at_index)
- **************************************************************************/
-static libvlc_media_t *
-flat_media_list_view_item_at_index( libvlc_media_list_view_t * p_mlv,
-                                    int index,
-                                    libvlc_exception_t * p_e )
-{
-    libvlc_media_t * p_md;
-    (void)p_e;
-    p_md = vlc_array_item_at_index( &p_mlv->p_this_view_data->array, index );
-    libvlc_media_retain( p_md );
-    return p_md;
-}
-
-/**************************************************************************
- *       flat_media_list_view_item_at_index  (private)
- * (called by flat_media_list_view_item_at_index)
- **************************************************************************/
-static libvlc_media_list_view_t *
-flat_media_list_view_children_at_index( libvlc_media_list_view_t * p_mlv,
-                                        int index,
-                                        libvlc_exception_t * p_e )
-{
-    (void)p_mlv; (void)index; (void)p_e;
-    return NULL;
-}
-
-/**************************************************************************
- *       flat_media_list_view_release (private)
- * (called by media_list_view_release)
- **************************************************************************/
-static void
-flat_media_list_view_release( libvlc_media_list_view_t * p_mlv )
-{
-    vlc_array_clear( &p_mlv->p_this_view_data->array );
-    free( p_mlv->p_this_view_data );
-}
-
-/*
- * Public libvlc functions
- */
-
-/* Little helper */
-static void
-import_mlist_rec( libvlc_media_list_view_t * p_mlv,
-                  libvlc_media_list_t * p_mlist,
-                  libvlc_exception_t * p_e )
-{
-    int i, count;
-    count = libvlc_media_list_count( p_mlist );
-    for( i = 0; i < count; i++ )
-    {
-        libvlc_media_t * p_md;
-        libvlc_media_list_t * p_submlist;
-        p_md = libvlc_media_list_item_at_index( p_mlist, i, p_e );
-        vlc_array_append( &p_mlv->p_this_view_data->array, p_md );
-        p_submlist = libvlc_media_subitems( p_md );
-        if( p_submlist )
-        {
-            libvlc_media_list_lock( p_submlist );
-            import_mlist_rec( p_mlv, p_submlist, p_e );
-            libvlc_media_list_unlock( p_submlist );
-            libvlc_media_list_release( p_submlist );
-        }
-        /* No need to release the md, as we want to retain it, as it is
-         * stored in our array */
-    }
-}
-                        
-/**************************************************************************
- *       libvlc_media_list_flat_view (Public)
- **************************************************************************/
-libvlc_media_list_view_t *
-libvlc_media_list_flat_view( libvlc_media_list_t * p_mlist,
-                             libvlc_exception_t * p_e )
-{
-    trace("\n");
-    libvlc_media_list_view_t * p_mlv;
-    struct libvlc_media_list_view_private_t * p_this_view_data;
-    p_this_view_data = malloc(sizeof(struct libvlc_media_list_view_private_t));
-    vlc_array_init( &p_this_view_data->array );
-    p_mlv = libvlc_media_list_view_new( p_mlist,
-                                        flat_media_list_view_count,
-                                        flat_media_list_view_item_at_index,
-                                        flat_media_list_view_children_at_index,
-                                        libvlc_media_list_flat_view,
-                                        flat_media_list_view_release,
-                                        p_this_view_data );
-    libvlc_media_list_lock( p_mlist );
-    import_mlist_rec( p_mlv, p_mlist, p_e );
-    libvlc_media_list_view_set_ml_notification_callback( p_mlv,
-        ml_item_added,
-        ml_item_removed );
-    libvlc_media_list_unlock( p_mlist );
-
-    return p_mlv;
-}

src/control/hierarchical_media_list_view.c

-/*****************************************************************************
- * hierarchical_media_list_view.c: libvlc hierarchical media list view functs.
- *****************************************************************************
- * Copyright (C) 2007 the VideoLAN team
- * $Id$
- *
- * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc/libvlc.h>
-#include <vlc/libvlc_media.h>
-#include <vlc/libvlc_media_list.h>
-#include <vlc/libvlc_media_list_view.h>
-
-#include "media_list_internal.h"
-#include "media_list_view_internal.h"
-
-//#define DEBUG_HIERARCHICAL_VIEW
-
-#ifdef DEBUG_HIERARCHICAL_VIEW
-# define trace( fmt, ... ) printf( "%s(): " fmt, __FUNCTION__, ##__VA_ARGS__ )
-#else
-# define trace( ... )
-#endif
-
-/*
- * Private functions
- */
-
-/**************************************************************************
- *       flat_media_list_view_count  (private)
- * (called by media_list_view_count)
- **************************************************************************/
-static int
-hierarch_media_list_view_count( libvlc_media_list_view_t * p_mlv,
-                                libvlc_exception_t * p_e )
-{
-    VLC_UNUSED(p_e);
-    return libvlc_media_list_count( p_mlv->p_mlist );
-}
-
-/**************************************************************************
- *       flat_media_list_view_item_at_index  (private)
- * (called by flat_media_list_view_item_at_index)
- **************************************************************************/
-static libvlc_media_t *
-hierarch_media_list_view_item_at_index( libvlc_media_list_view_t * p_mlv,
-                                    int index,
-                                    libvlc_exception_t * p_e )
-{
-    return libvlc_media_list_item_at_index( p_mlv->p_mlist, index, p_e );
-}
-
-/**************************************************************************
- *       flat_media_list_view_item_at_index  (private)
- * (called by flat_media_list_view_item_at_index)
- **************************************************************************/
-static libvlc_media_list_view_t *
-hierarch_media_list_view_children_at_index( libvlc_media_list_view_t * p_mlv,
-                                        int index,
-                                        libvlc_exception_t * p_e )
-{
-    libvlc_media_t * p_md;
-    libvlc_media_list_t * p_submlist;
-    libvlc_media_list_view_t * p_ret;
-    p_md = libvlc_media_list_item_at_index( p_mlv->p_mlist, index, p_e );
-    if( !p_md ) return NULL;
-    p_submlist = libvlc_media_subitems( p_md );
-    libvlc_media_release( p_md );
-    if( !p_submlist ) return NULL;
-    p_ret = libvlc_media_list_hierarchical_view( p_submlist );
-    libvlc_media_list_release( p_submlist );
-
-    return p_ret;
-}
-
-/**************************************************************************
- *       media_list_(item|will)_* (private) (Event callback)
- **************************************************************************/
-static void
-media_list_item_added( const libvlc_event_t * p_event, void * user_data )
-{
-    libvlc_media_t * p_md;
-    libvlc_media_list_view_t * p_mlv = user_data;
-    int index = p_event->u.media_list_item_added.index;
-    p_md = p_event->u.media_list_item_added.item;
-    libvlc_media_list_view_item_added( p_mlv, p_md, index );
-}
-static void
-media_list_will_add_item( const libvlc_event_t * p_event, void * user_data )
-{
-    libvlc_media_t * p_md;
-    libvlc_media_list_view_t * p_mlv = user_data;
-    int index = p_event->u.media_list_will_add_item.index;
-    p_md = p_event->u.media_list_will_add_item.item;
-    libvlc_media_list_view_will_add_item( p_mlv, p_md, index );
-}
-static void
-media_list_item_deleted( const libvlc_event_t * p_event, void * user_data )
-{
-    libvlc_media_t * p_md;
-    libvlc_media_list_view_t * p_mlv = user_data;
-    int index = p_event->u.media_list_item_deleted.index;
-    p_md = p_event->u.media_list_item_deleted.item;
-    libvlc_media_list_view_item_deleted( p_mlv, p_md, index );
-}
-static void
-media_list_will_delete_item( const libvlc_event_t * p_event, void * user_data )
-{
-    libvlc_media_t * p_md;
-    libvlc_media_list_view_t * p_mlv = user_data;
-    int index = p_event->u.media_list_will_delete_item.index;
-    p_md = p_event->u.media_list_will_delete_item.item;
-    libvlc_media_list_view_will_delete_item( p_mlv, p_md, index );
-}
-
-/*
- * Public libvlc functions
- */
-
-
-/**************************************************************************
- *       flat_media_list_view_release (private)
- * (called by media_list_view_release)
- **************************************************************************/
-static void
-hierarch_media_list_view_release( libvlc_media_list_view_t * p_mlv )
-{
-    libvlc_event_detach( p_mlv->p_mlist->p_event_manager,
-                         libvlc_MediaListItemAdded,
-                         media_list_item_added, p_mlv );
-    libvlc_event_detach( p_mlv->p_mlist->p_event_manager,
-                         libvlc_MediaListWillAddItem,
-                         media_list_will_add_item, p_mlv );
-    libvlc_event_detach( p_mlv->p_mlist->p_event_manager,
-                         libvlc_MediaListItemDeleted,
-                         media_list_item_deleted, p_mlv );
-    libvlc_event_detach( p_mlv->p_mlist->p_event_manager,
-                         libvlc_MediaListWillDeleteItem,
-                         media_list_will_delete_item, p_mlv );
-}
-
-/**************************************************************************
- *       libvlc_media_list_flat_view (Public)
- **************************************************************************/
-libvlc_media_list_view_t *
-libvlc_media_list_hierarchical_view( libvlc_media_list_t * p_mlist )
-{
-    trace("\n");
-    libvlc_media_list_view_t * p_mlv;
-    p_mlv = libvlc_media_list_view_new( p_mlist,
-                                        hierarch_media_list_view_count,
-                                        hierarch_media_list_view_item_at_index,
-                                        hierarch_media_list_view_children_at_index,
-                                        libvlc_media_list_hierarchical_view,
-                                        hierarch_media_list_view_release,
-                                        NULL );
-    libvlc_media_list_lock( p_mlist );
-    libvlc_event_attach( p_mlv->p_mlist->p_event_manager,
-                         libvlc_MediaListItemAdded,
-                         media_list_item_added, p_mlv );
-    libvlc_event_attach( p_mlv->p_mlist->p_event_manager,
-                         libvlc_MediaListWillAddItem,
-                         media_list_will_add_item, p_mlv );
-    libvlc_event_attach( p_mlv->p_mlist->p_event_manager,
-                         libvlc_MediaListItemDeleted,
-                         media_list_item_deleted, p_mlv );
-    libvlc_event_attach( p_mlv->p_mlist->p_event_manager,
-                         libvlc_MediaListWillDeleteItem,
-                         media_list_will_delete_item, p_mlv );
-    libvlc_media_list_unlock( p_mlist );
-    return p_mlv;
-}

src/control/media_list_view_internal.h

-/*****************************************************************************
- * libvlc_internal.h : Definition of opaque structures for libvlc exported API
- * Also contains some internal utility functions
- *****************************************************************************
- * Copyright (C) 2005-2009 the VideoLAN team
- * $Id$
- *
- * Authors: Clément Stenac <zorglub@videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef LIBVLC_MEDIA_LIST_VIEW_INTERNAL_H
-#define LIBVLC_MEDIA_LIST_VIEW_INTERNAL_H 1
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc/vlc.h>
-#include <vlc/libvlc_structures.h>
-#include <vlc/libvlc_media_list.h>
-
-#include <vlc_common.h>
-
-typedef libvlc_media_list_view_t * (*libvlc_media_list_view_constructor_func_t)( libvlc_media_list_t * p_mlist, libvlc_exception_t * p_e ) ;
-typedef void (*libvlc_media_list_view_release_func_t)( libvlc_media_list_view_t * p_mlv ) ;
-
-typedef int (*libvlc_media_list_view_count_func_t)( libvlc_media_list_view_t * p_mlv,
-        libvlc_exception_t * ) ;
-
-typedef libvlc_media_t *
-        (*libvlc_media_list_view_item_at_index_func_t)(
-                libvlc_media_list_view_t * p_mlv,
-                int index,
-                libvlc_exception_t * ) ;
-
-typedef libvlc_media_list_view_t *
-        (*libvlc_media_list_view_children_at_index_func_t)(
-                libvlc_media_list_view_t * p_mlv,
-                int index,
-                libvlc_exception_t * ) ;
-
-/* A way to see a media list */
-struct libvlc_media_list_view_t
-{
-    libvlc_event_manager_t *    p_event_manager;
-    libvlc_instance_t *         p_libvlc_instance;
-    int                         i_refcount;
-    vlc_mutex_t                 object_lock;
-
-    libvlc_media_list_t *       p_mlist;
-
-    struct libvlc_media_list_view_private_t * p_this_view_data;
-
-    /* Accessors */
-    libvlc_media_list_view_count_func_t              pf_count;
-    libvlc_media_list_view_item_at_index_func_t      pf_item_at_index;
-    libvlc_media_list_view_children_at_index_func_t  pf_children_at_index;
-
-    libvlc_media_list_view_constructor_func_t        pf_constructor;
-    libvlc_media_list_view_release_func_t            pf_release;
-
-    /* Notification callback */
-    void (*pf_ml_item_added)(const libvlc_event_t *, libvlc_media_list_view_t *);
-    void (*pf_ml_item_removed)(const libvlc_event_t *, libvlc_media_list_view_t *);
-};
-
-/* Media List View */
-libvlc_media_list_view_t * libvlc_media_list_view_new(
-        libvlc_media_list_t * p_mlist,
-        libvlc_media_list_view_count_func_t pf_count,
-        libvlc_media_list_view_item_at_index_func_t pf_item_at_index,
-        libvlc_media_list_view_children_at_index_func_t pf_children_at_index,
-        libvlc_media_list_view_constructor_func_t pf_constructor,
-        libvlc_media_list_view_release_func_t pf_release,
-        void * this_view_data );
-
-void libvlc_media_list_view_set_ml_notification_callback(
-        libvlc_media_list_view_t * p_mlv,
-        void (*item_added)(const libvlc_event_t *, libvlc_media_list_view_t *),
-        void (*item_removed)(const libvlc_event_t *, libvlc_media_list_view_t *) );
-
-void libvlc_media_list_view_will_delete_item(
-        libvlc_media_list_view_t * p_mlv,
-        libvlc_media_t * p_item, int index );
-
-void libvlc_media_list_view_item_deleted(
-        libvlc_media_list_view_t * p_mlv,
-        libvlc_media_t * p_item, int index );
-
-void libvlc_media_list_view_will_add_item (
-        libvlc_media_list_view_t * p_mlv,
-        libvlc_media_t * p_item, int index );
-
-void libvlc_media_list_view_item_added(
-        libvlc_media_list_view_t * p_mlv,
-        libvlc_media_t * p_item, int index );
-
-#endif

src/libvlc.sym

@@ -76,9 +76,6 @@ libvlc_media_list_add_file_content
 libvlc_media_list_add_media
 libvlc_media_list_count
 libvlc_media_list_event_manager
-libvlc_media_list_flat_view
-libvlc_media_list_hierarchical_node_view
-libvlc_media_list_hierarchical_view
 libvlc_media_list_index_of_item
 libvlc_media_list_insert_media
 libvlc_media_list_is_readonly
@@ -106,20 +103,6 @@ libvlc_media_list_remove_index
 libvlc_media_list_retain
 libvlc_media_list_set_media
 libvlc_media_list_unlock
-libvlc_media_list_view_children_at_index
-libvlc_media_list_view_children_for_item
-libvlc_media_list_view_count
-libvlc_media_list_view_event_manager
-libvlc_media_list_view_item_added
-libvlc_media_list_view_item_at_index
-libvlc_media_list_view_item_deleted
-libvlc_media_list_view_new
-libvlc_media_list_view_parent_media_list
-libvlc_media_list_view_release
-libvlc_media_list_view_retain
-libvlc_media_list_view_set_ml_notification_callback
-libvlc_media_list_view_will_add_item
-libvlc_media_list_view_will_delete_item
 libvlc_media_new
 libvlc_media_new_as_node
 libvlc_media_new_from_input_item

src/test/headers.c

@@ -42,7 +42,6 @@
 #include <vlc/libvlc_media_library.h>
 #include <vlc/libvlc_media_list.h>
 #include <vlc/libvlc_media_list_player.h>
-#include <vlc/libvlc_media_list_view.h>
 #include <vlc/libvlc_media_player.h>
 #include <vlc/libvlc_vlm.h>
 #include <vlc/mediacontrol.h>