libvlc.h: Don't expose libvlc_tree. It will get deleted.

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 4068c7515c463277991a3623e989d4532048cb3d..8c57beb5d2ef2bde6e125b54b00cce504543eafe 100644 (file)
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -121,58 +121,6 @@ VLC_PUBLIC_API void libvlc_destroy( libvlc_instance_t *, libvlc_exception_t * );
 
 /** @}*/
 
-/*****************************************************************************
- * Tree
- *****************************************************************************/
-/** defgroup libvlc_tree Tree
- * \ingroup libvlc
- * LibVLC Tree. A tree holds an item plus several subtrees.
- * @{
- */
-VLC_PUBLIC_API libvlc_tree_t *
-    libvlc_tree_new_with_media_list_as_item( libvlc_media_list_t * p_mlist,
-                                             libvlc_exception_t * p_e );
-
-VLC_PUBLIC_API libvlc_tree_t *
-    libvlc_tree_new_with_string_as_item( const char * psz,
-                                         libvlc_exception_t * p_e );
-VLC_PUBLIC_API void
-    libvlc_tree_release( libvlc_tree_t * p_tree );
-
-VLC_PUBLIC_API void
-    libvlc_tree_retain( libvlc_tree_t * p_tree );
-
-VLC_PUBLIC_API char *
-    libvlc_tree_item_as_string( libvlc_tree_t * p_tree,
-                                libvlc_exception_t * p_e );
-
-VLC_PUBLIC_API libvlc_media_list_t *
-    libvlc_tree_item_as_media_list( libvlc_tree_t * p_tree,
-                                    libvlc_exception_t * p_e );
-
-VLC_PUBLIC_API int
-    libvlc_tree_subtree_count( libvlc_tree_t * p_tree, libvlc_exception_t * p_e );
-
-VLC_PUBLIC_API libvlc_tree_t *
-    libvlc_tree_subtree_at_index( libvlc_tree_t * p_tree,
-                              int index,
-                              libvlc_exception_t * p_e );
-
-VLC_PUBLIC_API void
-    libvlc_tree_insert_subtree_at_index( libvlc_tree_t * p_tree,
-                                         libvlc_tree_t * p_subtree,
-                                         int index,
-                                         libvlc_exception_t * p_e );
-
-VLC_PUBLIC_API void
-    libvlc_tree_remove_subtree_at_index( libvlc_tree_t * p_tree,
-                                         int index,
-                                         libvlc_exception_t * p_e );
-
-/**@} */
-
-
-
 /*****************************************************************************
  * Media descriptor
  *****************************************************************************/
@@ -1232,7 +1180,6 @@ VLC_PUBLIC_API void libvlc_event_detach( libvlc_event_manager_t *p_event_manager
                                          void *p_user_data,
                                          libvlc_exception_t *p_e );
 
-
 /**
  * Get an event type name 
  * \param i_event_type the desired event

diff --git a/include/vlc/libvlc_structures.h b/include/vlc/libvlc_structures.h
index 909c30edd9f9ba2b68575d738fe8818539a70f30..e6b8f1942e9d87f5b30360eef960ffc5270d4778 100644 (file)
--- a/include/vlc/libvlc_structures.h
+++ b/include/vlc/libvlc_structures.h
@@ -52,22 +52,6 @@ typedef struct libvlc_exception_t
 
 /**@} */
 
-/*****************************************************************************
- * Tree
- *****************************************************************************/
-/** defgroup libvlc_tree Tree
- * \ingroup libvlc
- * LibVLC Tree 
- * @{
- */
-
-typedef void (*libvlc_retain_function)(void *);
-typedef void (*libvlc_release_function)(void *);
-
-typedef struct libvlc_tree_t libvlc_tree_t;
-
-/**@} */
-
 /*****************************************************************************
  * Tag
  *****************************************************************************/
@@ -313,10 +297,6 @@ typedef enum libvlc_event_type_t {
     libvlc_MediaListPlayerNextItemSet,
     libvlc_MediaListPlayerStopped,
 
-    libvlc_TreeSubtreeAdded,
-    libvlc_TreeSubtreeDeleted,
-    libvlc_TreeItemValueChanged,
-
 } libvlc_event_type_t;
 
 /**
@@ -359,23 +339,6 @@ typedef struct libvlc_event_t
             libvlc_media_descriptor_t * item;
             int index;
         } media_list_item_deleted;
-
-        /* Tree */
-        struct
-        {
-            libvlc_tree_t * subtree;
-            int index;
-        } tree_subtree_added;
-        struct
-        {
-            libvlc_tree_t * subtree;
-            int index;
-        } tree_subtree_deleted;
-        struct
-        {
-            void * new_value;
-        } tree_item_value_changed;
-
     } u;
 } libvlc_event_t;
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 4bf33fe921edb36928bdcc6e547ad7b9655e23c6..c4a74b53c6ccf4dfd577db388c53adede1b64842 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -327,8 +327,7 @@ SOURCES_libvlc_control = \
        control/mediacontrol_util.c \
        control/mediacontrol_audio_video.c \
        control/media_discoverer.c \
-       control/tag_query.c \
-       control/tree.c
+       control/tag_query.c
 
 ###############################################################################
 # Stamp rules

diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h
index 429ad431ebc037eb7e07a11a9e5daca9dff3e64b..65909e7b0697a35a9424cc99cd9150e5e75b33be 100644 (file)
--- a/src/control/libvlc_internal.h
+++ b/src/control/libvlc_internal.h
@@ -95,16 +95,6 @@ struct libvlc_tag_query_t
     char *             psz_tag_key;
 };
 
-struct libvlc_tree_t
-{
-    libvlc_event_manager_t * p_event_manager;
-    int     i_refcount;
-    void *  p_item; /* For dynamic sublist */
-    libvlc_retain_function  pf_item_retain;
-    libvlc_release_function pf_item_release;
-    DECL_ARRAY(struct libvlc_tree_t *)  subtrees; /* For dynamic sublist */
-};
-
 struct libvlc_media_list_t
 {
     libvlc_event_manager_t * p_event_manager;
@@ -161,7 +151,6 @@ struct libvlc_media_library_t
     libvlc_instance_t *      p_libvlc_instance;
     int                      i_refcount;
     libvlc_media_list_t *    p_mlist;
-    libvlc_tree_t *          p_playlists_tree;
 };
 
 struct libvlc_media_discoverer_t