More clean up (it has 1 minor side effect but in a buggy section anyway).

[vlc] / src / input / control.c

diff --git a/src/input/control.c b/src/input/control.c
index 255fd9bdf6952831b677464eee552209f7c9d7a1..d29229ac87889e66202e85a1cd661174dfce84aa 100644 (file)
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -21,17 +21,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "input_internal.h"
-#include "vlc_playlist.h"
 
 
 static void UpdateBookmarksOption( input_thread_t * );
-static void NotifyPlaylist( input_thread_t * );
 
 /****************************************************************************
  * input_Control
@@ -196,7 +198,11 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
             vlc_mutex_unlock( &p_input->p->input.p_item->lock );
 
             if( !p_input->b_preparsing )
-                NotifyPlaylist( p_input );
+            {
+                vlc_event_t event;
+                event.type = vlc_InputItemInfoChanged;
+                vlc_event_send( &p_input->p->input.p_item->event_manager, &event );
+            }
         }
         return VLC_SUCCESS;
 
@@ -263,8 +269,11 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
             vlc_mutex_unlock( &p_input->p->input.p_item->lock );
 
             if( !p_input->b_preparsing )
-                NotifyPlaylist( p_input );
-
+            {
+                vlc_event_t event;
+                event.type = vlc_InputItemInfoChanged;
+                vlc_event_send( &p_input->p->input.p_item->event_manager, &event );
+            }
             return VLC_SUCCESS;
         }
 
@@ -295,8 +304,12 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
             vlc_mutex_unlock( &p_input->p->input.p_item->lock );
 
             if( !p_input->b_preparsing )
-                NotifyPlaylist( p_input );
-
+            {
+                vlc_event_t event;
+                event.type = vlc_InputItemNameChanged;
+                event.u.input_item_name_changed.new_name = psz_name;
+                vlc_event_send( &p_input->p->input.p_item->event_manager, &event );
+            }
             return VLC_SUCCESS;
         }
 
@@ -494,38 +507,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:
@@ -612,14 +605,6 @@ 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 );
-    var_SetInteger( p_playlist, "item-change",
-                    p_input->p->input.p_item->i_id );
-    pl_Release( p_input );
-}
-
 static void UpdateBookmarksOption( input_thread_t *p_input )
 {
     int i, i_len = 0;
@@ -628,7 +613,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 );
@@ -637,7 +622,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 );