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 55e420719d899f1c093d80fb851cfea7bff9d1ba..d29229ac87889e66202e85a1cd661174dfce84aa 100644 (file)
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -25,17 +25,15 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#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
@@ -200,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;
 
@@ -267,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;
         }
 
@@ -299,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;
         }
 
@@ -506,9 +515,8 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
             if( asprintf( &str, "%s=%s", psz_option, psz_value ) == -1 )
                 return VLC_ENOMEM;
 
-            input_ItemAddOpt( p_input->p->input.p_item, str,
-                              VLC_INPUT_OPTION_UNIQUE );
-            i = VLC_SUCCESS;
+            i = input_ItemAddOpt( p_input->p->input.p_item, str,
+                                  VLC_INPUT_OPTION_UNIQUE );
             free( str );
             return i;
         }
@@ -597,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;
@@ -613,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 );
@@ -622,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 );