#ifndef _VLC_VLM_H
#define _VLC_VLM_H 1
-#ifdef __cpluplus
-extern "C" {
-#endif
-
#include <vlc_input.h>
/* VLM media */
};
+#ifdef __cpluplus
+extern "C" {
+#endif
+
#define vlm_New( a ) __vlm_New( VLC_OBJECT(a) )
VLC_EXPORT( vlm_t *, __vlm_New, ( vlc_object_t * ) );
VLC_EXPORT( void, vlm_Delete, ( vlm_t * ) );
VLC_EXPORT( int, vlm_ExecuteCommand, ( vlm_t *, const char *, vlm_message_t ** ) );
VLC_EXPORT( int, vlm_Control, ( vlm_t *p_vlm, int i_query, ... ) );
-VLC_EXPORT( vlm_message_t *, vlm_MessageNew, ( const char *, const char *, ... ) );
+VLC_EXPORT( vlm_message_t *, vlm_MessageNew, ( const char *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) );
VLC_EXPORT( vlm_message_t *, vlm_MessageAdd, ( vlm_message_t *, vlm_message_t * ) );
VLC_EXPORT( void, vlm_MessageDelete, ( vlm_message_t * ) );
p_dst->psz_name = strdup( p_src->psz_name );
for( i = 0; i < p_src->i_input; i++ )
- TAB_APPEND( p_dst->i_input, p_dst->ppsz_input, strdup(p_src->ppsz_input[i]) );
+ TAB_APPEND_CPP( char, p_dst->i_input, p_dst->ppsz_input, strdup(p_src->ppsz_input[i]) );
for( i = 0; i < p_src->i_option; i++ )
- TAB_APPEND( p_dst->i_option, p_dst->ppsz_option, strdup(p_src->ppsz_option[i]) );
+ TAB_APPEND_CPP( char, p_dst->i_option, p_dst->ppsz_option, strdup(p_src->ppsz_option[i]) );
if( p_src->psz_output )
p_dst->psz_output = strdup( p_src->psz_output );
static inline void vlm_media_Clean( vlm_media_t *p_media )
{
int i;
- if( p_media->psz_name )
- free( p_media->psz_name );
+ free( p_media->psz_name );
for( i = 0; i < p_media->i_input; i++ )
free( p_media->ppsz_input[i]) ;
free( p_media->ppsz_option[i]) ;
TAB_CLEAN(p_media->i_option, p_media->ppsz_option );
- if( p_media->psz_output )
- free( p_media->psz_output );
+ free( p_media->psz_output );
if( p_media->b_vod )
- {
- if( p_media->vod.psz_mux )
- free( p_media->vod.psz_mux );
- }
+ free( p_media->vod.psz_mux );
}
static inline vlm_media_t *vlm_media_New(void)
{
- vlm_media_t *p_media = malloc( sizeof(vlm_media_t) );
+ vlm_media_t *p_media = (vlm_media_t *)malloc( sizeof(vlm_media_t) );
if( p_media )
vlm_media_Init( p_media );
return p_media;
}
static inline void vlm_media_instance_Clean( vlm_media_instance_t *p_instance )
{
- if( p_instance->psz_name )
- free( p_instance->psz_name );
+ free( p_instance->psz_name );
}
static inline vlm_media_instance_t *vlm_media_instance_New(void)
{
- vlm_media_instance_t *p_instance = malloc( sizeof(vlm_media_instance_t) );
+ vlm_media_instance_t *p_instance = (vlm_media_instance_t *) malloc( sizeof(vlm_media_instance_t) );
if( p_instance )
vlm_media_instance_Init( p_instance );
return p_instance;