#ifdef ENABLE_VLM
-#ifndef WIN32
-# include <sys/time.h> /* gettimeofday() */
-#endif
-
-#ifdef HAVE_TIME_H
-# include <time.h> /* ctime() */
-# include <sys/timeb.h> /* ftime() */
-#endif
+#include <time.h> /* ctime() */
#include <vlc_input.h>
#include "input_internal.h"
#include <vlc_stream.h>
#include "vlm_internal.h"
-#include <vlc_vod.h>
#include <vlc_charset.h>
#include <vlc_sout.h>
#include "../stream_output/stream_output.h"
* Local prototypes.
*****************************************************************************/
-/* ugly kludge to avoid "null format string" warnings,
- * even if we handle NULL format string in vlm_MessageNew() */
-static const char *vlm_NULL = NULL;
-
/* */
static vlm_message_t *vlm_Show( vlm_t *, vlm_media_sys_t *, vlm_schedule_sys_t *, const char * );
static int Unescape( char *out, const char *in )
{
char c, quote = 0;
+ bool param = false;
while( (c = *in++) != '\0' )
{
+ // Don't escape the end of the string if we find a '#'
+ // that's the begining of a vlc command
+ // TODO: find a better solution
+ if( c == '#' || param )
+ {
+ param = true;
+ *out++ = c;
+ continue;
+ }
+
if( !quote )
{
if (strchr(quotes,c)) // opening quote
return VLC_EGENERIC;
}
- *pp_status = vlm_MessageNew( "del", vlm_NULL );
+ *pp_status = vlm_MessageSimpleNew( "del" );
return VLC_SUCCESS;
}
vlm_message_t *message_child;
#define MessageAdd( a ) \
- vlm_MessageAdd( *pp_status, vlm_MessageNew( a, vlm_NULL ) );
+ vlm_MessageAdd( *pp_status, vlm_MessageSimpleNew( a ) );
#define MessageAddChild( a ) \
- vlm_MessageAdd( message_child, vlm_MessageNew( a, vlm_NULL ) );
+ vlm_MessageAdd( message_child, vlm_MessageSimpleNew( a ) );
- *pp_status = vlm_MessageNew( "help", vlm_NULL );
+ *pp_status = vlm_MessageSimpleNew( "help" );
message_child = MessageAdd( "Commands Syntax:" );
MessageAddChild( "new (name) vod|broadcast|schedule [properties]" );
*pp_status = vlm_MessageNew( "control", "unknown error" );
return VLC_SUCCESS;
}
- *pp_status = vlm_MessageNew( "control", vlm_NULL );
+ *pp_status = vlm_MessageSimpleNew( "control" );
return VLC_SUCCESS;
}
{
char *psz_export = Save( p_vlm );
- *pp_status = vlm_MessageNew( "export", psz_export );
+ *pp_status = vlm_MessageNew( "export", "%s", psz_export );
free( psz_export );
return VLC_SUCCESS;
}
free( psz_save );
- *pp_status = vlm_MessageNew( "save", vlm_NULL );
+ *pp_status = vlm_MessageSimpleNew( "save" );
return VLC_SUCCESS;
error:
static int ExecuteLoad( vlm_t *p_vlm, const char *psz_url, vlm_message_t **pp_status )
{
stream_t *p_stream = stream_UrlNew( p_vlm, psz_url );
- int64_t i_size;
+ uint64_t i_size;
char *psz_buffer;
if( !p_stream )
}
i_size = stream_Size( p_stream );
+ if( i_size > SIZE_MAX - 1 )
+ i_size = SIZE_MAX - 1;
psz_buffer = malloc( i_size + 1 );
if( !psz_buffer )
free( psz_buffer );
- *pp_status = vlm_MessageNew( "load", vlm_NULL );
+ *pp_status = vlm_MessageSimpleNew( "load" );
return VLC_SUCCESS;
}
psz_line = strdup( ppsz_property[i] );
for( j = i+1; j < i_property; j++ )
{
- psz_line = realloc( psz_line, strlen(psz_line) + strlen(ppsz_property[j]) + 1 + 1 );
+ psz_line = xrealloc( psz_line,
+ strlen(psz_line) + strlen(ppsz_property[j]) + 1 + 1 );
strcat( psz_line, " " );
strcat( psz_line, ppsz_property[j] );
}
i++;
}
}
- *pp_status = vlm_MessageNew( psz_cmd, vlm_NULL );
+ *pp_status = vlm_MessageSimpleNew( psz_cmd );
return VLC_SUCCESS;
error:
i_result = vlm_ControlInternal( p_vlm, VLM_CHANGE_MEDIA, p_cfg );
vlm_media_Delete( p_cfg );
- *pp_status = vlm_MessageNew( psz_cmd, vlm_NULL );
+ *pp_status = vlm_MessageSimpleNew( psz_cmd );
return i_result;
error:
/* support for comments */
if( i_command == 0 && *psz_command == '#')
{
- p_message = vlm_MessageNew( "", vlm_NULL );
+ p_message = vlm_MessageSimpleNew( "" );
goto success;
}
if( psz_temp == NULL )
{
- p_message = vlm_MessageNew( "Incomplete command", psz_command );
+ p_message = vlm_MessageNew( "Incomplete command", "%s", psz_command );
goto error;
}
#define IF_EXECUTE( name, check, cmd ) if( !strcmp(ppsz_command[0], name ) ) { if( (check) ) goto syntax_error; if( (cmd) ) goto error; goto success; }
if( i_command == 0 )
{
- p_message = vlm_MessageNew( "", vlm_NULL );
+ p_message = vlm_MessageSimpleNew( "" );
goto success;
}
else IF_EXECUTE( "del", (i_command != 2), ExecuteDel(p_vlm, ppsz_command[1], &p_message) )
TAB_APPEND( vlm->i_schedule, vlm->schedule, p_sched );
+ vlc_mutex_lock( &vlm->lock_manage );
+ vlc_cond_signal( &vlm->wait_manage );
+ vlc_mutex_unlock( &vlm->lock_manage );
+
return p_sched;
}
/*****************************************************************************
* Message handling functions
*****************************************************************************/
-vlm_message_t *vlm_MessageNew( const char *psz_name,
- const char *psz_format, ... )
+vlm_message_t *vlm_MessageSimpleNew( const char *psz_name )
{
- vlm_message_t *p_message;
- va_list args;
-
if( !psz_name ) return NULL;
- p_message = malloc( sizeof(vlm_message_t) );
- if( !p_message)
- {
+ vlm_message_t *p_message = malloc( sizeof(*p_message) );
+ if( !p_message )
return NULL;
- }
- p_message->psz_value = 0;
-
- if( psz_format )
+ p_message->psz_name = strdup( psz_name );
+ if( !p_message->psz_name )
{
- va_start( args, psz_format );
- if( vasprintf( &p_message->psz_value, psz_format, args ) == -1 )
- {
- va_end( args );
- free( p_message );
- return NULL;
- }
- va_end( args );
+ free( p_message );
+ return NULL;
}
-
- p_message->psz_name = strdup( psz_name );
+ p_message->psz_value = NULL;
p_message->i_child = 0;
p_message->child = NULL;
return p_message;
}
+vlm_message_t *vlm_MessageNew( const char *psz_name,
+ const char *psz_format, ... )
+{
+ vlm_message_t *p_message = vlm_MessageSimpleNew( psz_name );
+ va_list args;
+
+ if( !p_message )
+ return NULL;
+
+ assert( psz_format );
+ va_start( args, psz_format );
+ if( vasprintf( &p_message->psz_value, psz_format, args ) == -1 )
+ p_message->psz_value = NULL;
+ va_end( args );
+
+ if( !p_message->psz_value )
+ {
+ vlm_MessageDelete( p_message );
+ return NULL;
+ }
+ return p_message;
+}
+
void vlm_MessageDelete( vlm_message_t *p_message )
{
free( p_message->psz_name );
vlm_message_t *p_msg_sub;
int i;
- p_msg = vlm_MessageNew( p_cfg->psz_name, vlm_NULL );
+ p_msg = vlm_MessageSimpleNew( p_cfg->psz_name );
vlm_MessageAdd( p_msg,
vlm_MessageNew( "type", p_cfg->b_vod ? "vod" : "broadcast" ) );
vlm_MessageAdd( p_msg,
if( p_cfg->b_vod )
vlm_MessageAdd( p_msg,
- vlm_MessageNew( "mux", p_cfg->vod.psz_mux ) );
+ vlm_MessageNew( "mux", "%s", p_cfg->vod.psz_mux ) );
else
vlm_MessageAdd( p_msg,
vlm_MessageNew( "loop", p_cfg->broadcast.b_loop ? "yes" : "no" ) );
- p_msg_sub = vlm_MessageAdd( p_msg, vlm_MessageNew( "inputs", vlm_NULL ) );
+ p_msg_sub = vlm_MessageAdd( p_msg, vlm_MessageSimpleNew( "inputs" ) );
for( i = 0; i < p_cfg->i_input; i++ )
{
char *psz_tmp;
if( asprintf( &psz_tmp, "%d", i+1 ) != -1 )
{
vlm_MessageAdd( p_msg_sub,
- vlm_MessageNew( psz_tmp, p_cfg->ppsz_input[i] ) );
+ vlm_MessageNew( psz_tmp, "%s", p_cfg->ppsz_input[i] ) );
free( psz_tmp );
}
}
vlm_MessageAdd( p_msg,
- vlm_MessageNew( "output", p_cfg->psz_output ? p_cfg->psz_output : "" ) );
+ vlm_MessageNew( "output", "%s", p_cfg->psz_output ? p_cfg->psz_output : "" ) );
- p_msg_sub = vlm_MessageAdd( p_msg, vlm_MessageNew( "options", vlm_NULL ) );
+ p_msg_sub = vlm_MessageAdd( p_msg, vlm_MessageSimpleNew( "options" ) );
for( i = 0; i < p_cfg->i_option; i++ )
- vlm_MessageAdd( p_msg_sub, vlm_MessageNew( p_cfg->ppsz_option[i], vlm_NULL ) );
+ vlm_MessageAdd( p_msg_sub, vlm_MessageSimpleNew( p_cfg->ppsz_option[i] ) );
- p_msg_sub = vlm_MessageAdd( p_msg, vlm_MessageNew( "instances", vlm_NULL ) );
+ p_msg_sub = vlm_MessageAdd( p_msg, vlm_MessageSimpleNew( "instances" ) );
for( i = 0; i < p_media->i_instance; i++ )
{
vlm_media_instance_sys_t *p_instance = p_media->instance[i];
if( p_instance->p_input )
var_Get( p_instance->p_input, "state", &val );
- p_msg_instance = vlm_MessageAdd( p_msg_sub, vlm_MessageNew( "instance" , vlm_NULL ) );
+ p_msg_instance = vlm_MessageAdd( p_msg_sub, vlm_MessageSimpleNew( "instance" ) );
vlm_MessageAdd( p_msg_instance,
- vlm_MessageNew( "name" , p_instance->psz_name ? p_instance->psz_name : "default" ) );
+ vlm_MessageNew( "name" , "%s", p_instance->psz_name ? p_instance->psz_name : "default" ) );
vlm_MessageAdd( p_msg_instance,
vlm_MessageNew( "state",
val.i_int == PLAYING_S ? "playing" :
var_Get ## type( p_instance->p_input, a ) ) != -1 ) \
{ \
vlm_MessageAdd( p_msg_instance, vlm_MessageNew( a, \
- psz_tmp ) ); \
+ "%s", psz_tmp ) ); \
free( psz_tmp ); \
}
APPEND_INPUT_INFO( "position", "%f", Float );
APPEND_INPUT_INFO( "time", "%"PRIi64, Time );
APPEND_INPUT_INFO( "length", "%"PRIi64, Time );
- APPEND_INPUT_INFO( "rate", "%d", Integer );
+ APPEND_INPUT_INFO( "rate", "%f", Float );
APPEND_INPUT_INFO( "title", "%d", Integer );
APPEND_INPUT_INFO( "chapter", "%d", Integer );
APPEND_INPUT_INFO( "can-seek", "%d", Bool );
if( asprintf( &psz_tmp, "%d", p_instance->i_index + 1 ) != -1 )
{
vlm_MessageAdd( p_msg_instance, vlm_MessageNew( "playlistindex",
- psz_tmp ) );
+ "%s", psz_tmp ) );
free( psz_tmp );
}
}
{
if( media != NULL )
{
- vlm_message_t *p_msg = vlm_MessageNew( "show", vlm_NULL );
+ vlm_message_t *p_msg = vlm_MessageSimpleNew( "show" );
if( p_msg )
vlm_MessageAdd( p_msg, vlm_ShowMedia( media ) );
return p_msg;
vlm_message_t *msg_child;
char buffer[100];
- msg = vlm_MessageNew( "show", vlm_NULL );
+ msg = vlm_MessageSimpleNew( "show" );
msg_schedule =
- vlm_MessageAdd( msg, vlm_MessageNew( schedule->psz_name, vlm_NULL ) );
+ vlm_MessageAdd( msg, vlm_MessageSimpleNew( schedule->psz_name ) );
vlm_MessageAdd( msg_schedule, vlm_MessageNew("type", "schedule") );
date.tm_hour, date.tm_min, date.tm_sec ) != -1 )
{
vlm_MessageAdd( msg_schedule,
- vlm_MessageNew( "date", psz_date ) );
+ vlm_MessageNew( "date", "%s", psz_date ) );
free( psz_date );
}
}
sprintf( buffer, "%d/%d/%d-%d:%d:%d", date.tm_year, date.tm_mon,
date.tm_mday, date.tm_hour, date.tm_min, date.tm_sec);
- vlm_MessageAdd( msg_schedule, vlm_MessageNew("period", buffer) );
+ vlm_MessageAdd( msg_schedule, vlm_MessageNew("period", "%s", buffer) );
}
else
vlm_MessageAdd( msg_schedule, vlm_MessageNew("period", "0") );
sprintf( buffer, "%d", schedule->i_repeat );
- vlm_MessageAdd( msg_schedule, vlm_MessageNew( "repeat", buffer ) );
+ vlm_MessageAdd( msg_schedule, vlm_MessageNew( "repeat", "%s", buffer ) );
msg_child =
- vlm_MessageAdd( msg_schedule, vlm_MessageNew("commands", vlm_NULL ) );
+ vlm_MessageAdd( msg_schedule, vlm_MessageSimpleNew("commands" ) );
for( i = 0; i < schedule->i_command; i++ )
{
vlm_MessageAdd( msg_child,
- vlm_MessageNew( schedule->command[i], vlm_NULL ) );
+ vlm_MessageSimpleNew( schedule->command[i] ) );
}
return msg;
if( asprintf( &psz_count, "( %d broadcast - %d vod )", i_broadcast,
i_vod) == -1 )
return NULL;
- p_msg = vlm_MessageNew( "show", vlm_NULL );
- p_msg_child = vlm_MessageAdd( p_msg, vlm_MessageNew( "media", psz_count ) );
+ p_msg = vlm_MessageSimpleNew( "show" );
+ p_msg_child = vlm_MessageAdd( p_msg, vlm_MessageNew( "media", "%s",
+ psz_count ) );
free( psz_count );
for( i = 0; i < vlm->i_media; i++ )
vlm_message_t *msg;
vlm_message_t *msg_child;
- msg = vlm_MessageNew( "show", vlm_NULL );
- msg_child = vlm_MessageAdd( msg, vlm_MessageNew( "schedule", vlm_NULL ) );
+ msg = vlm_MessageSimpleNew( "show" );
+ msg_child = vlm_MessageAdd( msg, vlm_MessageSimpleNew( "schedule" ) );
for( i = 0; i < vlm->i_schedule; i++ )
{
mtime_t i_time, i_next_date;
msg_schedule = vlm_MessageAdd( msg_child,
- vlm_MessageNew( s->psz_name, vlm_NULL ) );
+ vlm_MessageSimpleNew( s->psz_name ) );
vlm_MessageAdd( msg_schedule,
vlm_MessageNew( "enabled", s->b_enabled ?
"yes" : "no" ) );
#endif
vlm_MessageAdd( msg_schedule,
- vlm_MessageNew( "next launch", psz_date ) );
+ vlm_MessageNew( "next launch", "%s", psz_date ) );
#endif
}
}
else
{
- return vlm_MessageNew( "show", vlm_NULL );
+ return vlm_MessageSimpleNew( "show" );
}
}
projects / vlc / blobdiff