dsm/sd: use new libdsm API to discover NETBIOS shares

[vlc] / include / vlc_filter.h

diff --git a/include/vlc_filter.h b/include/vlc_filter.h
index eb474eb2c91d0c2ac80f15dc14e8b7f6f2094915..8e023614a2c4ca52572db76898008f6b40e3e5bb 100644 (file)
--- a/include/vlc_filter.h
+++ b/include/vlc_filter.h
@@ -46,12 +46,10 @@ typedef struct filter_owner_t
         struct
         {
             picture_t * (*buffer_new)( filter_t * );
-            void        (*buffer_del)( filter_t *, picture_t * );
         } video;
         struct
         {
             subpicture_t * (*buffer_new)( filter_t * );
-            void           (*buffer_del)( filter_t *, subpicture_t * );
         } sub;
     };
 } filter_owner_t;
@@ -156,7 +154,7 @@ struct filter_t
 
 /**
  * This function will return a new picture usable by p_filter as an output
- * buffer. You have to release it using filter_DeletePicture or by returning
+ * buffer. You have to release it using picture_Release or by returning
  * it to the caller as a pf_video_filter return value.
  * Provided for convenience.
  *
@@ -171,18 +169,6 @@ static inline picture_t *filter_NewPicture( filter_t *p_filter )
     return pic;
 }
 
-/**
- * This function will release a picture create by filter_NewPicture.
- * Provided for convenience.
- *
- * \param p_filter filter_t object
- * \param p_picture picture to be deleted
- */
-static inline void filter_DeletePicture( filter_t *p_filter, picture_t *pic )
-{
-    p_filter->owner.video.buffer_del( p_filter, pic );
-}
-
 /**
  * This function will flush the state of a video filter.
  */
@@ -194,8 +180,8 @@ static inline void filter_FlushPictures( filter_t *p_filter )
 
 /**
  * This function will return a new subpicture usable by p_filter as an output
- * buffer. You have to release it using filter_DeleteSubpicture or by returning
- * it to the caller as a pf_sub_source return value.
+ * buffer. You have to release it using subpicture_Delete or by returning it to
+ * the caller as a pf_sub_source return value.
  * Provided for convenience.
  *
  * \param p_filter filter_t object
@@ -209,19 +195,6 @@ static inline subpicture_t *filter_NewSubpicture( filter_t *p_filter )
     return subpic;
 }
 
-/**
- * This function will release a subpicture create by filter_NewSubicture.
- * Provided for convenience.
- *
- * \param p_filter filter_t object
- * \param p_subpicture to be released
- */
-static inline void filter_DeleteSubpicture( filter_t *p_filter,
-                                            subpicture_t *subpic )
-{
-    p_filter->owner.sub.buffer_del( p_filter, subpic );
-}
-
 /**
  * This function gives all input attachments at once.
  *
@@ -297,13 +270,25 @@ typedef struct filter_chain_t filter_chain_t;
  * \param p_object pointer to a vlc object
  * \param psz_capability vlc capability of filters in filter chain
  * \param b_allow_format_fmt_change allow changing of fmt
- * \param pf_buffer_allocation_init callback function to initialize buffer allocations
- * \param pf_buffer_allocation_clear callback function to clear buffer allocation initialization
- * \param p_buffer_allocation_data pointer to private allocation data
  * \return pointer to a filter chain
  */
-VLC_API filter_chain_t * filter_chain_New( vlc_object_t *, const char *, bool, int (*)( filter_t *, void * ), void (*)( filter_t * ), void *  ) VLC_USED;
-#define filter_chain_New( a, b, c, d, e, f ) filter_chain_New( VLC_OBJECT( a ), b, c, d, e, f )
+VLC_API filter_chain_t * filter_chain_New( vlc_object_t *, const char *, bool )
+VLC_USED;
+#define filter_chain_New( a, b, c ) filter_chain_New( VLC_OBJECT( a ), b, c )
+
+/**
+ * Creates a new video filter chain.
+ *
+ * \param obj pointer to parent VLC object
+ * \param change whether to allow changing the output format
+ * \param owner owner video buffer callbacks
+ * \return new filter chain, or NULL on error
+ */
+VLC_API filter_chain_t * filter_chain_NewVideo( vlc_object_t *obj, bool change,
+                                                const filter_owner_t *owner )
+VLC_USED;
+#define filter_chain_NewVideo( a, b, c ) \
+        filter_chain_NewVideo( VLC_OBJECT( a ), b, c )
 
 /**
  * Delete filter chain will delete all filters in the chain and free all
@@ -351,9 +336,8 @@ VLC_API int filter_chain_AppendFromString( filter_chain_t *, const char * );
  *
  * \param p_chain pointer to filter chain
  * \param p_filter pointer to filter object
- * \return VLC_SUCCESS on succes, else VLC_EGENERIC
  */
-VLC_API int filter_chain_DeleteFilter( filter_chain_t *, filter_t * );
+VLC_API void filter_chain_DeleteFilter( filter_chain_t *, filter_t * );
 
 /**
  * Get the number of filters in the filter chain.