# 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
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;
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;
}
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;
}
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;
}
}
}
-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;
char *psz_value = NULL, *psz_next = NULL;
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"}",
- p_input->p->bookmark[i]->psz_name,
- p_input->p->bookmark[i]->i_byte_offset,
- p_input->p->bookmark[i]->i_time_offset/1000000 );
- }
- for( i = 0; i < p_input->p->i_bookmark; i++ )
+ if( p_input->p->i_bookmark > 0 )
{
- if( !i ) psz_value = psz_next = malloc( i_len + p_input->p->i_bookmark );
-
- sprintf( psz_next, "{name=%s,bytes="I64Fd",time="I64Fd"}",
- p_input->p->bookmark[i]->psz_name,
- p_input->p->bookmark[i]->i_byte_offset,
- p_input->p->bookmark[i]->i_time_offset/1000000 );
+ for( i = 0; i < p_input->p->i_bookmark; i++ )
+ {
+ 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 );
+ }
+ psz_value = psz_next = malloc( i_len + p_input->p->i_bookmark );
- psz_next += strlen( psz_next );
- if( i < p_input->p->i_bookmark - 1)
+ for( i = 0; i < p_input->p->i_bookmark; i++ )
{
- *psz_next = ','; psz_next++;
+ 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 );
+
+ psz_next += strlen( psz_next );
+ if( i < p_input->p->i_bookmark - 1)
+ *psz_next = ','; psz_next++;
}
}
vlc_mutex_unlock( &p_input->p->input.p_item->lock );
input_Control( p_input, INPUT_ADD_OPTION, "bookmarks",
psz_value ? psz_value : "" );
+ free( psz_value );
}
+