* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <stdio.h>
p_cat = malloc( sizeof( info_category_t ) );
if( !p_cat )
{
- vlc_mutex_lock( &p_input->p->input.p_item->lock );
+ vlc_mutex_unlock( &p_input->p->input.p_item->lock );
return VLC_EGENERIC;
}
p_cat->psz_name = strdup( psz_cat );
p_info = malloc( sizeof( info_t ) );
if( !p_info )
{
- vlc_mutex_lock( &p_input->p->input.p_item->lock );
+ vlc_mutex_unlock( &p_input->p->input.p_item->lock );
return VLC_EGENERIC;
}
}
p_info = p_cat->pp_infos[i];
- vasprintf( &p_info->psz_value, psz_format, args );
+ if( vasprintf( &p_info->psz_value, psz_format, args ) == -1 )
+ p_info->psz_value = NULL;
vlc_mutex_unlock( &p_input->p->input.p_item->lock );
char *psz_name = (char *)va_arg( args, char * );
info_category_t *p_cat = NULL;
+ int i_cat;
int i;
vlc_mutex_lock( &p_input->p->input.p_item->lock );
- for( i = 0; i < p_input->p->input.p_item->i_categories; i++ )
+ for( i_cat = 0; i_cat < p_input->p->input.p_item->i_categories; i_cat++ )
{
- if( !strcmp( p_input->p->input.p_item->pp_categories[i]->psz_name,
+ if( !strcmp( p_input->p->input.p_item->pp_categories[i_cat]->psz_name,
psz_cat ) )
{
- p_cat = p_input->p->input.p_item->pp_categories[i];
+ p_cat = p_input->p->input.p_item->pp_categories[i_cat];
break;
}
}
return VLC_EGENERIC;
}
- for( i = 0; i < p_cat->i_infos; i++ )
+ if( psz_name )
{
- if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) )
+ /* Remove a specific info */
+ for( i = 0; i < p_cat->i_infos; i++ )
+ {
+ if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) )
+ {
+ free( p_cat->pp_infos[i]->psz_name );
+ if( p_cat->pp_infos[i]->psz_value )
+ free( p_cat->pp_infos[i]->psz_value );
+ free( p_cat->pp_infos[i] );
+ REMOVE_ELEM( p_cat->pp_infos, p_cat->i_infos, i );
+ break;
+ }
+ }
+ if( i >= p_cat->i_infos )
+ {
+ vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ return VLC_EGENERIC;
+ }
+ }
+ else
+ {
+ /* Remove the complete categorie */
+ for( i = 0; i < p_cat->i_infos; i++ )
{
free( p_cat->pp_infos[i]->psz_name );
if( p_cat->pp_infos[i]->psz_value )
free( p_cat->pp_infos[i]->psz_value );
free( p_cat->pp_infos[i] );
- REMOVE_ELEM( p_cat->pp_infos, p_cat->i_infos, i );
- break;
}
+ if( p_cat->pp_infos )
+ free( p_cat->pp_infos );
+ REMOVE_ELEM( p_input->p->input.p_item->pp_categories, p_input->p->input.p_item->i_categories, i_cat );
}
vlc_mutex_unlock( &p_input->p->input.p_item->lock );
- if( i >= p_cat->i_infos )
- return VLC_EGENERIC;
-
if( !p_input->b_preparsing )
NotifyPlaylist( p_input );
+
+ return VLC_SUCCESS;
}
- return VLC_SUCCESS;
case INPUT_GET_INFO:
vlc_mutex_lock( &p_input->p->input.p_item->lock );
if( !p_bkmk->psz_name )
{
- asprintf( &p_bkmk->psz_name, _("Bookmark %i"),
- p_input->p->i_bookmark );
+ if( asprintf( &p_bkmk->psz_name, _("Bookmark %i"),
+ p_input->p->i_bookmark ) == -1 )
+ p_bkmk->psz_name = NULL;
}
TAB_APPEND( p_input->p->i_bookmark, p_input->p->bookmark, p_bkmk );
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 **) );
- }
-
- asprintf( &p_input->p->input.p_item->ppsz_options[i],
- "%s=%s", psz_option, psz_value ) ;
- vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ if( asprintf( &str, "%s=%s", psz_option, psz_value ) == -1 )
+ return VLC_ENOMEM;
- 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:
stream_Size( p_input->p->input.p_stream );
return VLC_SUCCESS;
+ case INPUT_GET_VIDEO_FPS:
+ {
+ int i;
+ pf = (double*)va_arg( args, double * );
+ vlc_mutex_lock( &p_input->p->input.p_item->lock );
+ *pf = p_input->p->input.f_fps;
+ for( i = 0; i < p_input->p->i_slave && *pf <= 0.001; i++ )
+ *pf = p_input->p->slave[i]->f_fps;
+ vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ return VLC_SUCCESS;
+ }
+
case INPUT_ADD_SLAVE:
psz = (char*)va_arg( args, char * );
if( psz && *psz )
}
return VLC_SUCCESS;
+ case INPUT_GET_ATTACHMENTS: /* arg1=input_attachment_t***, arg2=int* res=can fail */
+ {
+ input_attachment_t ***ppp_attachment = (input_attachment_t***)va_arg( args, input_attachment_t *** );
+ int *pi_attachment = (int*)va_arg( args, int * );
+ int i;
+
+ vlc_mutex_lock( &p_input->p->input.p_item->lock );
+ if( p_input->p->i_attachment <= 0 )
+ {
+ vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ *ppp_attachment = NULL;
+ *pi_attachment = 0;
+ return VLC_EGENERIC;
+ }
+ *pi_attachment = p_input->p->i_attachment;
+ *ppp_attachment = malloc( sizeof(input_attachment_t**) * p_input->p->i_attachment );
+ for( i = 0; i < p_input->p->i_attachment; i++ )
+ (*ppp_attachment)[i] = vlc_input_attachment_Duplicate( p_input->p->attachment[i] );
+
+ vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ return VLC_SUCCESS;
+ }
+
+ case INPUT_GET_ATTACHMENT: /* arg1=input_attachment_t**, arg2=char* res=can fail */
+ {
+ input_attachment_t **pp_attachment = (input_attachment_t**)va_arg( args, input_attachment_t ** );
+ const char *psz_name = (const char*)va_arg( args, const char * );
+ int i;
+
+ vlc_mutex_lock( &p_input->p->input.p_item->lock );
+ for( i = 0; i < p_input->p->i_attachment; i++ )
+ {
+ if( !strcmp( p_input->p->attachment[i]->psz_name, psz_name ) )
+ {
+ *pp_attachment = vlc_input_attachment_Duplicate( p_input->p->attachment[i] );
+ vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ return VLC_SUCCESS;
+ }
+ }
+ *pp_attachment = NULL;
+ vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ return VLC_EGENERIC;
+ }
+
+
default:
msg_Err( p_input, "unknown query in input_vaControl" );
return VLC_EGENERIC;
static void NotifyPlaylist( input_thread_t *p_input )
{
- playlist_t *p_playlist = pl_Yield( p_input );
+ playlist_t *p_playlist = pl_Get( p_input );
+ if( p_playlist->b_die )
+ return;
+ vlc_object_yield( p_playlist );
var_SetInteger( p_playlist, "item-change",
p_input->p->input.p_item->i_id );
pl_Release( p_input );
vlc_mutex_lock( &p_input->p->input.p_item->lock );
for( i = 0; i < p_input->p->i_bookmark; i++ )
{
- asprintf( &psz_value, "{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 );
- i_len += strlen( psz_value );
- free( psz_value );
+ 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++ )
{
projects / vlc / blobdiff