Handles the VLC_EEXITSUCESS case

[vlc] / src / input / control.c

diff --git a/src/input/control.c b/src/input/control.c
index 324e771948c171677bf80d2c12e0b0ded3f26ee3..be1785615a0981faefc96fadc1f8a7535d609b9f 100644 (file)
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -498,38 +498,18 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
 
         case INPUT_ADD_OPTION:
         {
-            char *psz_option = (char *)va_arg( args, char * );
-            char *psz_value = (char *)va_arg( args, char * );
+            const char *psz_option = va_arg( args, const char * );
+            const char *psz_value = va_arg( args, const char * );
+            char *str;
             int i;
 
-            vlc_mutex_lock( &p_input->p->input.p_item->lock );
-            /* Check if option already exists */
-            for( i = 0; i < p_input->p->input.p_item->i_options; i++ )
-            {
-                if( !strncmp( p_input->p->input.p_item->ppsz_options[i],
-                              psz_option, strlen( psz_option ) ) &&
-                    p_input->p->input.p_item->ppsz_options[i][strlen(psz_option)]
-                      == '=' )
-                {
-                    free( p_input->p->input.p_item->ppsz_options[i] );
-                    break;
-                }
-            }
-            if( i == p_input->p->input.p_item->i_options )
-            {
-                p_input->p->input.p_item->i_options++;
-                p_input->p->input.p_item->ppsz_options =
-                    realloc( p_input->p->input.p_item->ppsz_options,
-                             p_input->p->input.p_item->i_options *
-                             sizeof(char **) );
-            }
+            if( asprintf( &str, "%s=%s", psz_option, psz_value ) == -1 )
+                return VLC_ENOMEM;
 
-            if( asprintf( &p_input->p->input.p_item->ppsz_options[i],
-                          "%s=%s", psz_option, psz_value ) == -1 )
-                p_input->p->input.p_item->ppsz_options[i] = NULL;
-            vlc_mutex_unlock( &p_input->p->input.p_item->lock );
-
-            return VLC_SUCCESS;
+            i = input_ItemAddOpt( p_input->p->input.p_item, str,
+                                  VLC_INPUT_OPTION_UNIQUE );
+            free( str );
+            return i;
         }
 
         case INPUT_GET_BYTE_POSITION:
@@ -618,10 +598,16 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
 
 static void NotifyPlaylist( input_thread_t *p_input )
 {
-    playlist_t *p_playlist = pl_Yield( p_input );
+    /* FIXME: We need to avoid that dependency on the playlist
+     * because it is a circular dependency:
+     * ( playlist -> input -> playlist ) */
+    playlist_t *p_playlist = vlc_object_find( p_input,
+                    VLC_OBJECT_PLAYLIST, FIND_PARENT );
+    if( !p_playlist )
+        return;
     var_SetInteger( p_playlist, "item-change",
                     p_input->p->input.p_item->i_id );
-    pl_Release( p_input );
+    vlc_object_release( p_playlist );
 }
 
 static void UpdateBookmarksOption( input_thread_t *p_input )
@@ -632,7 +618,7 @@ static void UpdateBookmarksOption( input_thread_t *p_input )
     vlc_mutex_lock( &p_input->p->input.p_item->lock );
     for( i = 0; i < p_input->p->i_bookmark; i++ )
     {
-        i_len += snprintf( NULL, 0, "{name=%s,bytes="I64Fd",time="I64Fd"}",
+        i_len += snprintf( NULL, 0, "{name=%s,bytes=%"PRId64",time=%"PRId64"}",
                            p_input->p->bookmark[i]->psz_name,
                            p_input->p->bookmark[i]->i_byte_offset,
                            p_input->p->bookmark[i]->i_time_offset/1000000 );
@@ -641,7 +627,7 @@ static void UpdateBookmarksOption( input_thread_t *p_input )
     {
         if( !i ) psz_value = psz_next = malloc( i_len + p_input->p->i_bookmark );
 
-        sprintf( psz_next, "{name=%s,bytes="I64Fd",time="I64Fd"}",
+        sprintf( psz_next, "{name=%s,bytes=%"PRId64",time=%"PRId64"}",
                  p_input->p->bookmark[i]->psz_name,
                  p_input->p->bookmark[i]->i_byte_offset,
                  p_input->p->bookmark[i]->i_time_offset/1000000 );