Add flags when adding an input item option

diff --git a/include/vlc_input.h b/include/vlc_input.h
index f602c51077552ea20ee195d78d2d480740adb79e..441f263b28cd8d5bff161d427258c02f527fa313 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -142,8 +142,16 @@ static inline void input_ItemAddSubItem( input_item_t *p_parent,
     vlc_event_send( &p_parent->event_manager, &event );
 }
 
-VLC_EXPORT( void, input_ItemAddOption,( input_item_t *, const char * ) );
-VLC_EXPORT( void, input_ItemAddOptionNoDup,( input_item_t *, const char * ) );
+#define VLC_INPUT_OPTION_UNIQUE  0x1
+#define VLC_INPUT_OPTION_TRUSTED 0x2
+
+VLC_EXPORT( void, input_ItemAddOpt, ( input_item_t *, const char *str, unsigned flags ) );
+
+static inline
+void input_ItemAddOption (input_item_t *item, const char *str)
+{
+    input_ItemAddOpt (item, str, VLC_INPUT_OPTION_TRUSTED);
+}
 
 static inline void input_ItemClean( input_item_t *p_i )
 {

diff --git a/src/control/media_descriptor.c b/src/control/media_descriptor.c
index 4363ace07f0bf763a70dad441d66a7ab48134b9b..3dee389c46815d8ad07752ef46658e6f56b0e39f 100644 (file)
--- a/src/control/media_descriptor.c
+++ b/src/control/media_descriptor.c
@@ -342,7 +342,8 @@ void libvlc_media_descriptor_add_option(
                                    libvlc_exception_t *p_e )
 {
     (void)p_e;
-    input_ItemAddOptionNoDup( p_md->p_input_item, ppsz_option );
+    input_ItemAddOpt( p_md->p_input_item, ppsz_option,
+                      VLC_INPUT_OPTION_UNIQUE|VLC_INPUT_OPTION_TRUSTED );
 }
 
 /**************************************************************************

diff --git a/src/input/item.c b/src/input/item.c
index fbb16f5f337033d007961ec843eeac7d0fd21dc6..9452723c4279e2ad38e4547ff3f3bc03f7c938db 100644 (file)
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -115,33 +115,25 @@ static void input_ItemDestroy ( gc_object_t *p_this )
     free( p_input );
 }
 
-void input_ItemAddOption( input_item_t *p_input,
-                          const char *psz_option )
+void input_ItemAddOpt( input_item_t *p_input, const char *psz_option,
+                       unsigned flags )
 {
-    if( !psz_option ) return;
-    vlc_mutex_lock( &p_input->lock );
-    INSERT_ELEM( p_input->ppsz_options, p_input->i_options,
-                 p_input->i_options, strdup( psz_option ) );
-    vlc_mutex_unlock( &p_input->lock );
-}
+    if( psz_option == NULL )
+        return;
 
-void input_ItemAddOptionNoDup( input_item_t *p_input,
-                               const char *psz_option )
-{
-    int i;
-    if( !psz_option ) return ;
     vlc_mutex_lock( &p_input->lock );
-    for( i = 0 ; i< p_input->i_options; i++ )
+    if (flags & VLC_INPUT_OPTION_UNIQUE)
     {
-        if( !strcmp( p_input->ppsz_options[i], psz_option ) )
-        {
-            vlc_mutex_unlock(& p_input->lock );
-            return;
-        }
+        for (int i = 0 ; i < p_input->i_options; i++)
+            if( !strcmp( p_input->ppsz_options[i], psz_option ) )
+                goto out;
     }
-    TAB_APPEND( p_input->i_options, p_input->ppsz_options, strdup( psz_option));    vlc_mutex_unlock( &p_input->lock );
-}
 
+    INSERT_ELEM( p_input->ppsz_options, p_input->i_options,
+                 p_input->i_options, strdup( psz_option ) );
+out:
+    vlc_mutex_unlock( &p_input->lock );
+}
 
 int input_ItemAddInfo( input_item_t *p_i,
                             const char *psz_cat,

diff --git a/src/libvlc.sym b/src/libvlc.sym
index acd16880cc399dc41bcbfaf363b068b2492e401d..ff6916a2546989c72d918fab926a36a90d74ee08 100644 (file)
--- a/src/libvlc.sym
+++ b/src/libvlc.sym
@@ -130,8 +130,7 @@ input_DecoderNew
 input_DestroyThread
 input_GetItem
 input_ItemAddInfo
-input_ItemAddOption
-input_ItemAddOptionNoDup
+input_ItemAddOpt
 input_ItemGetById
 input_ItemGetInfo
 __input_ItemNewExt