#include <vlc_es.h>
#include <vlc_meta.h>
+#include <vlc_epg.h>
struct vlc_meta_t;
static inline void input_ItemInit( vlc_object_t *p_o, input_item_t *p_i )
{
memset( p_i, 0, sizeof(input_item_t) );
- p_i->psz_name = 0;
- p_i->psz_uri = 0;
- p_i->i_es = 0;
- p_i->es = 0;
- p_i->i_options = 0;
- p_i->ppsz_options = 0;
- p_i->i_categories = 0 ;
- p_i->pp_categories = 0;
+ p_i->psz_name = NULL;
+ p_i->psz_uri = NULL;
+ TAB_INIT( p_i->i_es, p_i->es );
+ TAB_INIT( p_i->i_options, p_i->ppsz_options );
+ TAB_INIT( p_i->i_categories, p_i->pp_categories );
+
p_i->i_type = ITEM_TYPE_UNKNOWN;
p_i->b_fixed_name = VLC_TRUE;
static inline void input_ItemClean( input_item_t *p_i )
{
+ int i;
+
free( p_i->psz_name );
free( p_i->psz_uri );
if( p_i->p_stats )
free( p_i->p_stats );
}
- if( p_i->p_meta ) vlc_meta_Delete( p_i->p_meta );
+ if( p_i->p_meta )
+ vlc_meta_Delete( p_i->p_meta );
- while( p_i->i_options )
+ for( i = 0; i < p_i->i_options; i++ )
{
- p_i->i_options--;
- if( p_i->ppsz_options[p_i->i_options] )
- free( p_i->ppsz_options[p_i->i_options] );
- if( !p_i->i_options ) free( p_i->ppsz_options );
+ if( p_i->ppsz_options[i] )
+ free( p_i->ppsz_options[i] );
}
+ TAB_CLEAN( p_i->i_options, p_i->ppsz_options );
- while( p_i->i_es )
+ for( i = 0; i < p_i->i_es; i++ )
{
- p_i->i_es--;
- es_format_Clean( p_i->es[p_i->i_es] );
- if( !p_i->i_es ) free( p_i->es );
+ es_format_Clean( p_i->es[i] );
+ free( p_i->es[i] );
}
+ TAB_CLEAN( p_i->i_es, p_i->es );
- while( p_i->i_categories )
+ for( i = 0; i < p_i->i_categories; i++ )
{
- info_category_t *p_category =
- p_i->pp_categories[--(p_i->i_categories)];
+ info_category_t *p_category = p_i->pp_categories[i];
+ int j;
- while( p_category->i_infos )
+ for( j = 0; j < p_category->i_infos; j++ )
{
- p_category->i_infos--;
+ struct info_t *p_info = p_category->pp_infos[j];
- if( p_category->pp_infos[p_category->i_infos]->psz_name )
- free( p_category->pp_infos[p_category->i_infos]->psz_name);
- if( p_category->pp_infos[p_category->i_infos]->psz_value )
- free( p_category->pp_infos[p_category->i_infos]->psz_value );
- free( p_category->pp_infos[p_category->i_infos] );
-
- if( !p_category->i_infos ) free( p_category->pp_infos );
+ if( p_info->psz_name )
+ free( p_info->psz_name);
+ if( p_info->psz_value )
+ free( p_info->psz_value );
+ free( p_info );
}
+ TAB_CLEAN( p_category->i_infos, p_category->pp_infos );
if( p_category->psz_name ) free( p_category->psz_name );
free( p_category );
-
- if( !p_i->i_categories ) free( p_i->pp_categories );
}
+ TAB_CLEAN( p_i->i_categories, p_i->pp_categories );
vlc_mutex_destroy( &p_i->lock );
}
#define input_ItemNew( a,b,c ) input_ItemNewExt( a, b, c, 0, NULL, -1 )
#define input_ItemNewExt(a,b,c,d,e,f) __input_ItemNewExt( VLC_OBJECT(a),b,c,d,e,f)
-VLC_EXPORT( input_item_t *, __input_ItemNewExt, (vlc_object_t *, const char *, const char*, int, const char *const *, int) );
-VLC_EXPORT( input_item_t *, input_ItemNewWithType, ( vlc_object_t *, const char *, const char *e, int, const char *const *, int, int ) );
+VLC_EXPORT( input_item_t *, __input_ItemNewExt, (vlc_object_t *, const char *, const char*, int, const char *const *, mtime_t i_duration ) );
+VLC_EXPORT( input_item_t *, input_ItemNewWithType, ( vlc_object_t *, const char *, const char *e, int, const char *const *, mtime_t i_duration, int ) );
VLC_EXPORT( input_item_t *, input_ItemGetById, (playlist_t *, int ) );
return dup;
}
+/*****************************************************************************
+ * Attachments
+ *****************************************************************************/
+struct input_attachment_t
+{
+ char *psz_name;
+ char *psz_mime;
+ char *psz_description;
+ int i_data;
+ void *p_data;
+};
+static inline input_attachment_t *vlc_input_attachment_New( const char *psz_name,
+ const char *psz_mime,
+ const char *psz_description,
+ const void *p_data,
+ int i_data )
+{
+ input_attachment_t *a =
+ (input_attachment_t*)malloc( sizeof(input_attachment_t) );
+ if( !a )
+ return NULL;
+ a->psz_name = strdup( psz_name ? psz_name : "" );
+ a->psz_mime = strdup( psz_mime ? psz_mime : "" );
+ a->psz_description = strdup( psz_description ? psz_description : "" );
+ a->i_data = i_data;
+ a->p_data = NULL;
+ if( i_data > 0 )
+ {
+ a->p_data = malloc( i_data );
+ if( a->p_data && p_data )
+ memcpy( a->p_data, p_data, i_data );
+ }
+ return a;
+}
+static inline input_attachment_t *vlc_input_attachment_Duplicate( const input_attachment_t *a )
+{
+ return vlc_input_attachment_New( a->psz_name, a->psz_mime, a->psz_description,
+ a->p_data, a->i_data );
+}
+static inline void vlc_input_attachment_Delete( input_attachment_t *a )
+{
+ if( !a )
+ return;
+ free( a->psz_name );
+ free( a->psz_mime );
+ free( a->psz_description );
+ if( a->p_data )
+ free( a->p_data );
+ free( a );
+}
/*****************************************************************************
* input defines/constants.
*****************************************************************************/
*/
#define INPUT_RATE_DEFAULT 1000
#define INPUT_RATE_MIN 125 /* Up to 8/1 */
-#define INPUT_RATE_MAX 8000 /* Up to 1/8 */
+#define INPUT_RATE_MAX 32000 /* Up to 1/32 */
/* i_update field of access_t/demux_t */
#define INPUT_UPDATE_NONE 0x0000
INPUT_DEL_BOOKMARK, /* arg1= seekpoint_t * res=can fail */
INPUT_SET_BOOKMARK, /* arg1= int res=can fail */
+ /* Attachments */
+ INPUT_GET_ATTACHMENTS, /* arg1=input_attachment_t***, arg2=int* res=can fail */
+ INPUT_GET_ATTACHMENT, /* arg1=input_attachment_t**, arg2=char* res=can fail */
+
/* On the fly input slave */
INPUT_ADD_SLAVE /* arg1= char * */
};