/*****************************************************************************
* vlm.c: VLM interface plugin
*****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
+ * Copyright (C) 2000-2005 the VideoLAN team
* $Id$
*
* Authors: Simon Latapie <garf@videolan.org>
* Laurent Aimar <fenrir@videolan.org>
+ * Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
+#include <vlc/vlc.h>
+
+#include <stdio.h>
#include <stdlib.h> /* malloc(), free() */
+#include <ctype.h> /* tolower() */
+
+#ifdef ENABLE_VLM
-#include <vlc/vlc.h>
#include <vlc/intf.h>
#include <vlc/input.h>
#ifdef HAVE_TIME_H
# include <time.h> /* ctime() */
+# include <sys/timeb.h> /* ftime() */
#endif
-#include "vlc_vlm.h"
+#include <vlc_vlm.h>
+#include <vlc_vod.h>
+#include <charset.h>
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
-static char *vlm_Save( vlm_t * );
-static int vlm_Load( vlm_t *, char *);
static vlm_message_t *vlm_Show( vlm_t *, vlm_media_t *, vlm_schedule_t *, char * );
static vlm_message_t *vlm_Help( vlm_t *, char * );
-static vlm_media_t *vlm_MediaNew ( vlm_t *, char *, int );
-static int vlm_MediaDelete ( vlm_t *, vlm_media_t *, char * );
-static vlm_media_t *vlm_MediaSearch ( vlm_t *, char * );
-static int vlm_MediaSetup ( vlm_media_t *, char *, char * );
-static int vlm_MediaControl( vlm_t *, vlm_media_t *, char *, char * );
+static vlm_media_instance_t *vlm_MediaInstanceSearch( vlm_t *, vlm_media_t *, const char * );
-static vlm_message_t* vlm_MessageNew( char * , char * );
-static vlm_message_t* vlm_MessageAdd( vlm_message_t*, vlm_message_t* );
+static vlm_message_t *vlm_MessageNew( char *, const char *, ... );
+static vlm_message_t *vlm_MessageAdd( vlm_message_t *, vlm_message_t * );
-static vlm_schedule_t *vlm_ScheduleNew( vlm_t *, char *);
-static int vlm_ScheduleDelete( vlm_t *, vlm_schedule_t *, char *);
-static int vlm_ScheduleSetup( vlm_schedule_t *, char *, char *);
-static vlm_schedule_t *vlm_ScheduleSearch( vlm_t *, char *);
+static vlm_schedule_t *vlm_ScheduleSearch( vlm_t *, const char * );
-
-static int ExecuteCommand( vlm_t *, char * , vlm_message_t **);
-
-static int Manage( vlc_object_t* );
+static char *Save( vlm_t * );
+static int Load( vlm_t *, char * );
+static int ExecuteCommand( vlm_t *, const char *, vlm_message_t ** );
+static int Manage( vlc_object_t * );
/*****************************************************************************
* vlm_New:
vlm_t *__vlm_New ( vlc_object_t *p_this )
{
vlc_value_t lockval;
- vlm_t *vlm = NULL;
+ vlm_t *p_vlm = NULL;
+ char *psz_vlmconf;
/* to be sure to avoid multiple creation */
- var_Create( p_this->p_libvlc, "vlm_mutex", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "vlm_mutex", &lockval );
+ var_Create( p_this->p_libvlc_global, "vlm_mutex", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "vlm_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
- if( !(vlm = vlc_object_find( p_this, VLC_OBJECT_VLM, FIND_ANYWHERE )) )
+ if( !(p_vlm = vlc_object_find( p_this, VLC_OBJECT_VLM, FIND_ANYWHERE )) )
{
- msg_Info( p_this, "creating vlm" );
- if( ( vlm = vlc_object_create( p_this, VLC_OBJECT_VLM ) ) == NULL )
+ msg_Info( p_this, "creating VLM" );
+ if( ( p_vlm = vlc_object_create( p_this, VLC_OBJECT_VLM ) ) == NULL )
{
vlc_mutex_unlock( lockval.p_address );
return NULL;
}
- vlc_mutex_init( p_this->p_vlc, &vlm->lock );
- vlm->i_media = 0;
- vlm->media = NULL;
- vlm->i_schedule = 0;
- vlm->schedule = NULL;
+ vlc_mutex_init( p_this->p_libvlc, &p_vlm->lock );
+ p_vlm->i_media = 0;
+ p_vlm->media = NULL;
+ p_vlm->i_vod = 0;
+ p_vlm->i_schedule = 0;
+ p_vlm->schedule = NULL;
- vlc_object_yield( vlm );
- vlc_object_attach( vlm, p_this->p_vlc );
+ vlc_object_yield( p_vlm );
+ vlc_object_attach( p_vlm, p_this->p_libvlc );
}
vlc_mutex_unlock( lockval.p_address );
-
- if( vlc_thread_create( vlm, "vlm thread",
+ if( vlc_thread_create( p_vlm, "vlm thread",
Manage, VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
{
- vlc_mutex_destroy( &vlm->lock );
- vlc_object_destroy( vlm );
+ vlc_mutex_destroy( &p_vlm->lock );
+ vlc_object_destroy( p_vlm );
return NULL;
}
- return vlm;
+
+ /* Try loading the vlm conf file given by --vlm-conf */
+ psz_vlmconf = config_GetPsz( p_vlm, "vlm-conf" );
+
+ if( psz_vlmconf && *psz_vlmconf )
+ {
+ vlm_message_t *p_message = NULL;
+ char *psz_buffer = NULL;
+
+ msg_Dbg( p_this, "loading VLM configuration" );
+ asprintf(&psz_buffer, "load %s", psz_vlmconf );
+ if( psz_buffer )
+ {
+ msg_Dbg( p_this, psz_buffer);
+ if( vlm_ExecuteCommand( p_vlm, psz_buffer, &p_message ) ){
+ msg_Warn( p_this, "error while loading the configuration file" );
+ }
+ vlm_MessageDelete(p_message);
+ free(psz_buffer);
+ }
+ }
+ free(psz_vlmconf);
+
+ return p_vlm;
}
/*****************************************************************************
* vlm_Delete:
*****************************************************************************/
-void vlm_Delete( vlm_t *vlm )
+void vlm_Delete( vlm_t *p_vlm )
{
vlc_value_t lockval;
- int i;
- var_Get( vlm->p_libvlc, "vlm_mutex", &lockval );
+ var_Get( p_vlm->p_libvlc_global, "vlm_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
- vlc_object_release( vlm );
+ vlc_object_release( p_vlm );
- if( vlm->i_refcount > 0 )
+ if( p_vlm->i_refcount > 0 )
{
vlc_mutex_unlock( lockval.p_address );
return;
}
- vlm->b_die = VLC_TRUE;
- vlc_thread_join( vlm );
+ p_vlm->b_die = VLC_TRUE;
+ vlc_thread_join( p_vlm );
- vlc_mutex_destroy( &vlm->lock );
+ vlc_mutex_destroy( &p_vlm->lock );
- for( i = 0; i < vlm->i_media; i++ )
- {
- vlm_media_t *media = vlm->media[i];
+ while( p_vlm->i_media ) vlm_MediaDelete( p_vlm, p_vlm->media[0], NULL );
+ FREENULL( p_vlm->media );
- vlm_MediaDelete( vlm, media, NULL );
- }
+ while( p_vlm->i_schedule ) vlm_ScheduleDelete( p_vlm,
+ p_vlm->schedule[0], NULL );
+ FREENULL( p_vlm->schedule );
- if( vlm->media ) free( vlm->media );
+ vlc_object_detach( p_vlm );
+ vlc_object_destroy( p_vlm );
+ vlc_mutex_unlock( lockval.p_address );
+}
- for( i = 0; i < vlm->i_schedule; i++ )
- {
- vlm_ScheduleDelete( vlm, vlm->schedule[i], NULL );
- }
+/*****************************************************************************
+ * vlm_ExecuteCommand:
+ *****************************************************************************/
+int vlm_ExecuteCommand( vlm_t *p_vlm, const char *psz_command,
+ vlm_message_t **pp_message)
+{
+ int i_result;
- if( vlm->schedule ) free( vlm->schedule );
+ vlc_mutex_lock( &p_vlm->lock );
+ i_result = ExecuteCommand( p_vlm, psz_command, pp_message );
+ vlc_mutex_unlock( &p_vlm->lock );
- vlc_object_detach( vlm );
- vlc_object_destroy( vlm );
- vlc_mutex_unlock( lockval.p_address );
+ return i_result;
}
/*****************************************************************************
- * vlm_ExecuteCommand:
+ * vlm_Save:
*****************************************************************************/
-int vlm_ExecuteCommand( vlm_t *vlm, char *command, vlm_message_t **message)
+int vlm_Save( vlm_t *p_vlm, const char *psz_file )
{
- int result;
+ FILE *file;
+ char *psz_save;
- vlc_mutex_lock( &vlm->lock );
- result = ExecuteCommand( vlm, command, message );
- vlc_mutex_unlock( &vlm->lock );
+ if( !p_vlm || !psz_file ) return 1;
+
+ file = utf8_fopen( psz_file, "wt" );
+ if( file == NULL ) return 1;
+
+ psz_save = Save( p_vlm );
+ if( psz_save == NULL )
+ {
+ fclose( file );
+ return 1;
+ }
+ fwrite( psz_save, strlen( psz_save ), 1, file );
+ fclose( file );
+ free( psz_save );
- return result;
+ return 0;
}
/*****************************************************************************
- *
+ * vlm_Load:
*****************************************************************************/
-#if 1
-static char *FindEndCommand( char *psz )
+int vlm_Load( vlm_t *p_vlm, const char *psz_file )
{
- char *s_sent = psz;
+ stream_t *p_stream;
+ int64_t i_size;
+ char *psz_buffer;
- switch( *s_sent )
+ if( !p_vlm || !psz_file ) return 1;
+
+ p_stream = stream_UrlNew( p_vlm, psz_file );
+ if( p_stream == NULL ) return 1;
+
+ if( stream_Seek( p_stream, 0 ) != 0 )
{
- case '\"':
- {
- s_sent++;
+ stream_Delete( p_stream );
+ return 2;
+ }
- while( ( *s_sent != '\"' ) && ( *s_sent != '\0' ) )
- {
- if( *s_sent == '\'' )
- {
- s_sent = FindEndCommand( s_sent );
+ i_size = stream_Size( p_stream );
- if( s_sent == NULL )
- {
- return NULL;
- }
- }
- else
- {
- s_sent++;
- }
- }
+ psz_buffer = malloc( i_size + 1 );
+ if( !psz_buffer )
+ {
+ stream_Delete( p_stream );
+ return 2;
+ }
- if( *s_sent == '\"' )
- {
- s_sent++;
- return s_sent;
- }
- else /* *s_sent == '\0' , which means the number of " is incorrect */
+ stream_Read( p_stream, psz_buffer, i_size );
+ psz_buffer[ i_size ] = '\0';
+
+ stream_Delete( p_stream );
+
+ if( Load( p_vlm, psz_buffer ) )
+ {
+ free( psz_buffer );
+ return 3;
+ }
+
+ free( psz_buffer );
+
+ return 0;
+}
+
+/*****************************************************************************
+ * FindEndCommand
+ *****************************************************************************/
+static const char *FindEndCommand( const char *psz_sent )
+{
+ vlc_bool_t b_escape = VLC_FALSE;
+
+ switch( *psz_sent )
+ {
+ case '\"':
+ psz_sent++;
+ while( ( *psz_sent != '\"' || b_escape == VLC_TRUE )
+ && ( *psz_sent != '\0' ) )
+ {
+ if( *psz_sent == '\'' && b_escape == VLC_FALSE )
{
- return NULL;
+ psz_sent = FindEndCommand( psz_sent );
+ if( psz_sent == NULL ) return NULL;
}
- break;
+ else if( *psz_sent++ == '\\' && b_escape == VLC_FALSE )
+ b_escape = VLC_TRUE;
+ else
+ b_escape = VLC_FALSE;
}
- case '\'':
+
+ if( *psz_sent == '\"' )
{
- s_sent++;
+ psz_sent++;
+ return psz_sent;
+ }
- while( ( *s_sent != '\'' ) && ( *s_sent != '\0' ) )
- {
- if( *s_sent == '\"' )
- {
- s_sent = FindEndCommand( s_sent );
+ /* *psz_sent == '\0' -> number of " is incorrect */
+ else return NULL;
- if( s_sent == NULL )
- {
- return NULL;
- }
- }
- else
- {
- s_sent++;
- }
- }
+ break;
- if( *s_sent == '\'' )
- {
- s_sent++;
- return s_sent;
- }
- else /* *s_sent == '\0' , which means the number of ' is incorrect */
- {
- return NULL;
- }
- break;
- }
- default: /* now we can look for spaces */
+ case '\'':
+ psz_sent++;
+ while( ( *psz_sent != '\'' || b_escape == VLC_TRUE )
+ && ( *psz_sent != '\0' ) )
{
- while( ( *s_sent != ' ' ) && ( *s_sent != '\0' ) )
+ if( *psz_sent == '\"' && b_escape == VLC_FALSE )
{
- if( ( *s_sent == '\'' ) || ( *s_sent == '\"' ) )
- {
- s_sent = FindEndCommand( s_sent );
- }
- else
- {
- s_sent++;
- }
+ psz_sent = FindEndCommand( psz_sent );
+ if( psz_sent == NULL ) return NULL;
}
- return s_sent;
+ else if( *psz_sent++ == '\\' && b_escape == VLC_FALSE )
+ b_escape = VLC_TRUE;
+ else
+ b_escape = VLC_FALSE;
}
- }
-}
-#else
-static char *FindEndCommand( char *psz )
-{
- char *s_sent = psz;
- while( *psz &&
- *psz != ' ' && *psz != '\t' &&
- *psz != '\n' && *psz != '\r' )
- {
- if( *psz == '\'' || *psz == '"' )
+ if( *psz_sent == '\'' )
{
- char d = *psz++;
+ psz_sent++;
+ return psz_sent;
+ }
- while( *psz && *psz != d && *psz != *psz != '\n' && *psz != '\r' )
- {
- if( ( d == '\'' && *psz == '"' ) ||
- ( d == '"' && *psz == '\'' ) )
- {
- psz = FindEndCommand( psz );
- }
- }
- if( psz != d )
+ /* *psz_sent == '\0' -> number of " is incorrect */
+ else return NULL;
+
+ break;
+
+ default: /* now we can look for spaces */
+ while( ( *psz_sent != ' ' ) && ( *psz_sent != '\0' ) )
+ {
+ if( ( ( *psz_sent == '\'' ) || ( *psz_sent == '\"' ) )
+ && b_escape == VLC_FALSE )
{
- return NULL;
+ psz_sent = FindEndCommand( psz_sent );
+ if( psz_sent == NULL ) return NULL;
}
+ else if( *psz_sent++ == '\\' && b_escape == VLC_FALSE )
+ b_escape = VLC_TRUE;
+ else
+ b_escape = VLC_FALSE;
+
}
- psz++;
+
+ return psz_sent;
}
}
-#endif
-
-/* Execute a command which ends by '\0' (string) */
-static int ExecuteCommand( vlm_t *vlm, char *command , vlm_message_t **p_message)
+/*****************************************************************************
+ * ExecuteCommand: The main state machine
+ *****************************************************************************
+ * Execute a command which ends with '\0' (string)
+ *****************************************************************************/
+static int ExecuteCommand( vlm_t *p_vlm, const char *psz_command,
+ vlm_message_t **pp_message )
{
- int i_return = 0;
int i_command = 0;
- char **p_command = NULL;
- char *cmd = command;
- int i;
- vlm_message_t * message = NULL;
+ char **ppsz_command = NULL;
+ const char *psz_cmd = psz_command;
+ vlm_message_t *p_message = NULL;
+ int i, j;
/* First, parse the line and cut it */
- while( *cmd != '\0' )
+ while( *psz_cmd != '\0' )
{
- if( *cmd == ' ' )
+ if( *psz_cmd == ' ' || *psz_cmd == '\t' )
{
- cmd++;
+ psz_cmd++;
}
else
{
- char *p_temp;
+ const char *psz_temp;
+ const char *psz_buf;
+ char *psz_dst;
+ vlc_bool_t b_escape = VLC_FALSE;
int i_temp;
- p_temp = FindEndCommand( cmd );
+ /* support for comments */
+ if( i_command == 0 && *psz_cmd == '#')
+ {
+ p_message = vlm_MessageNew( "", NULL );
+ goto success;
+ }
+
+ psz_temp = FindEndCommand( psz_cmd );
- if( p_temp == NULL )
+ if( psz_temp == NULL )
{
- i_return = 1;
- goto end_seq;
+ p_message = vlm_MessageNew( "Incomplete command", psz_cmd );
+ goto error;
}
- i_temp = p_temp - cmd;
+ i_temp = psz_temp - psz_cmd;
- p_command = realloc( p_command , (i_command + 1) * sizeof( char* ) );
- p_command[ i_command ] = malloc( (i_temp + 1) * sizeof( char ) ); // don't forget the '\0'
- strncpy( p_command[ i_command ] , cmd , i_temp );
- (p_command[ i_command ])[ i_temp ] = '\0';
+ ppsz_command = realloc( ppsz_command, (i_command + 1) *
+ sizeof(char*) );
+ ppsz_command[ i_command ] = malloc( (i_temp + 1) * sizeof(char) );
+
+ /* unescape ", ' and \ ... and everything else */
+ psz_buf = psz_cmd;
+ psz_dst = ppsz_command[ i_command ];
+ while( i_temp-- )
+ {
+ if( *psz_buf == '\\' && b_escape == VLC_FALSE )
+ b_escape = VLC_TRUE;
+ else
+ {
+ b_escape = VLC_FALSE;
+ *psz_dst = *psz_buf;
+ psz_dst++;
+ }
+ psz_buf++;
+ }
+ *psz_dst = '\0';
i_command++;
- cmd = p_temp;
+
+ psz_cmd = psz_temp;
}
}
- /* And then Interpret it */
+ /*
+ * And then Interpret it
+ */
if( i_command == 0 )
{
- message = vlm_MessageNew( "" , NULL );
- i_return = 0;
- goto end_seq;
+ p_message = vlm_MessageNew( "", NULL );
+ goto success;
}
- if( strcmp(p_command[0] , "segfault") == 0 )
- {
- /* the only command we really need */
- *((int *)NULL) = 42;
- }
- else if( strcmp(p_command[0] , "new") == 0 )
+ if( !strcmp(ppsz_command[0], "new") )
{
- if( i_command >= 3 )
- {
- int i_type;
- vlm_media_t *media;
- vlm_schedule_t *schedule;
-
- if( strcmp(p_command[2] , "schedule") == 0 )
- {
- /* new vlm_schedule */
- if( vlm_ScheduleSearch( vlm , p_command[1] ) != NULL || strcmp(p_command[1] , "schedule") == 0 )
- {
- char *error_message = malloc( strlen(p_command[1]) + strlen(" is already used") + 1 );
- sprintf( error_message, "%s is already used" , p_command[1] );
- message = vlm_MessageNew( "new" , error_message );
- free( error_message );
- i_return = 1;
- goto end_seq;
- }
+ int i_type;
- schedule = vlm_ScheduleNew( vlm , p_command[1] );
+ /* Check the number of arguments */
+ if( i_command < 3 ) goto syntax_error;
+ /* Get type */
+ if( !strcmp(ppsz_command[2], "vod") )
+ {
+ i_type = VOD_TYPE;
+ }
+ else if( !strcmp(ppsz_command[2], "broadcast") )
+ {
+ i_type = BROADCAST_TYPE;
+ }
+ else if( !strcmp(ppsz_command[2], "schedule") )
+ {
+ i_type = SCHEDULE_TYPE;
+ }
+ else
+ {
+ p_message =
+ vlm_MessageNew( "new", "%s: Choose between vod, "
+ "broadcast or schedule", ppsz_command[1] );
+ goto error;
+ }
- if( i_command > 3 ) // hey, there are properties
- {
- for( i = 3 ; i < i_command ; i++ )
- {
- if( strcmp( p_command[i] , "enabled" ) == 0 || strcmp( p_command[i] , "disabled" ) == 0 )
- {
- vlm_ScheduleSetup( schedule, p_command[i], NULL );
- }
- /* Beware: evrything behind append is considered as command line */
- else if( strcmp( p_command[i] , "append" ) == 0 )
- {
- i++;
-
- if( i < i_command )
- {
- int j;
- for( j = (i + 1); j < i_command; j++ )
- {
- p_command[i] = realloc( p_command[i], strlen(p_command[i]) + strlen(p_command[j]) + 1 + 1);
- strcat( p_command[i], " " );
- strcat( p_command[i], p_command[j] );
- }
-
- vlm_ScheduleSetup( schedule, p_command[i - 1], p_command[i] );
- }
- i = i_command;
- }
- else
- {
- if( (i+1) < i_command )
- {
- vlm_ScheduleSetup( schedule, p_command[i], p_command[i+1] );
- i++;
- }
- else
- {
- vlm_ScheduleDelete( vlm, schedule, NULL );
- message = vlm_MessageNew( p_command[i], "Wrong properties syntax" );
- i_return = 1;
- goto end_seq;
- }
- }
- }
-
- message = vlm_MessageNew( "new" , NULL );
- i_return = 0;
- goto end_seq;
- }
+ /* Check for forbidden media names */
+ if( !strcmp(ppsz_command[1], "all") ||
+ !strcmp(ppsz_command[1], "media") ||
+ !strcmp(ppsz_command[1], "schedule") )
+ {
+ p_message = vlm_MessageNew( "new", "\"all\", \"media\" and "
+ "\"schedule\" are reserved names" );
+ goto error;
+ }
- message = vlm_MessageNew( "new" , NULL );
- i_return = 0;
- goto end_seq;
- }
+ /* Check the name is not already in use */
+ if( vlm_ScheduleSearch( p_vlm, ppsz_command[1] ) ||
+ vlm_MediaSearch( p_vlm, ppsz_command[1] ) )
+ {
+ p_message = vlm_MessageNew( "new", "%s: Name already in use",
+ ppsz_command[1] );
+ goto error;
+ }
- if( strcmp(p_command[2] , "vod") == 0 )
- {
- i_type = VOD_TYPE;
- }
- else if( strcmp(p_command[2] , "broadcast") == 0 )
- {
- i_type = BROADCAST_TYPE;
- }
- else
+ /* Schedule */
+ if( i_type == SCHEDULE_TYPE )
+ {
+ vlm_schedule_t *p_schedule;
+ p_schedule = vlm_ScheduleNew( p_vlm, ppsz_command[1] );
+ if( !p_schedule )
{
- char *error_message = malloc( strlen(p_command[1]) + strlen(": Choose between vod or broadcast") + 1 );
- sprintf( error_message, "%s: Choose between vod or broadcast" , p_command[1] );
- message = vlm_MessageNew( "new" , error_message );
- free( error_message );
- i_return = 1;
- goto end_seq;
+ p_message = vlm_MessageNew( "new", "could not create schedule" );
+ goto error;
}
+ }
- /* new vlm_media */
- if( vlm_MediaSearch( vlm , p_command[1] ) != NULL || strcmp(p_command[1] , "media") == 0 )
+ /* Media */
+ else
+ {
+ vlm_media_t *p_media;
+ p_media = vlm_MediaNew( p_vlm, ppsz_command[1], i_type );
+ if( !p_media )
{
- char *error_message = malloc( strlen(p_command[1]) + strlen(" is already used") + 1 );
- sprintf( error_message, "%s is already used" , p_command[1] );
- message = vlm_MessageNew( "new" , error_message );
- free( error_message );
- i_return = 1;
- goto end_seq;
+ p_message = vlm_MessageNew( "new", "could not create media" );
+ goto error;
}
+ }
- media = vlm_MediaNew( vlm , p_command[1] , i_type );
+ if( i_command <= 3 )
+ {
+ p_message = vlm_MessageNew( "new", NULL );
+ goto success;
+ }
- if( i_command > 3 ) // hey, there are properties
- {
- for( i = 3 ; i < i_command ; i++ )
- {
- if( strcmp( p_command[i] , "enabled" ) == 0 || strcmp( p_command[i] , "disabled" ) == 0 )
- {
- vlm_MediaSetup( media, p_command[i], NULL );
- }
- else
- {
- if( (i+1) < i_command )
- {
- vlm_MediaSetup( media, p_command[i], p_command[i+1] );
- i++;
- }
- else
- {
- vlm_MediaDelete( vlm, media, NULL );
- message = vlm_MessageNew( p_command[i] , "Wrong properties syntax" );
- i_return = 1;
- goto end_seq;
- }
- }
- }
+ /* Properties will be dealt with later on */
+ }
- message = vlm_MessageNew( "new" , NULL );
- i_return = 0;
- goto end_seq;
- }
+ else if( !strcmp(ppsz_command[0], "setup") )
+ {
+ if( i_command < 2 ) goto syntax_error;
+
+ /* Properties will be dealt with later on */
+ }
+
+ else if( !strcmp(ppsz_command[0], "del") )
+ {
+ vlm_media_t *p_media;
+ vlm_schedule_t *p_schedule;
+
+ if( i_command < 2 ) goto syntax_error;
+
+ p_media = vlm_MediaSearch( p_vlm, ppsz_command[1] );
+ p_schedule = vlm_ScheduleSearch( p_vlm, ppsz_command[1] );
+
+ if( p_schedule != NULL )
+ {
+ vlm_ScheduleDelete( p_vlm, p_schedule, NULL );
+ }
+ else if( p_media != NULL )
+ {
+ vlm_MediaDelete( p_vlm, p_media, NULL );
+ }
+ else if( !strcmp(ppsz_command[1], "media") )
+ {
+ while( p_vlm->i_media ) vlm_MediaDelete( p_vlm, p_vlm->media[0],
+ NULL );
+ }
+ else if( !strcmp(ppsz_command[1], "schedule") )
+ {
+ while( p_vlm->i_schedule )
+ vlm_ScheduleDelete( p_vlm, p_vlm->schedule[0], NULL );
+ }
+ else if( !strcmp(ppsz_command[1], "all") )
+ {
+ while( p_vlm->i_media ) vlm_MediaDelete( p_vlm, p_vlm->media[0],
+ NULL );
- message = vlm_MessageNew( "new" , NULL );
- i_return = 0;
- goto end_seq;
+ while( p_vlm->i_schedule )
+ vlm_ScheduleDelete( p_vlm, p_vlm->schedule[0], NULL );
}
else
{
- message = vlm_MessageNew( "new" , "Wrong command syntax" );
- i_return = 1;
- goto end_seq;
+ p_message = vlm_MessageNew( "del", "%s: media unknown",
+ ppsz_command[1] );
+ goto error;
}
+
+ p_message = vlm_MessageNew( "del", NULL );
+ goto success;
}
- else if( strcmp(p_command[0] , "del") == 0 )
+
+ else if( !strcmp(ppsz_command[0], "show") )
{
- if( i_command >= 2 )
- {
- vlm_media_t *media;
- vlm_schedule_t *schedule;
+ vlm_media_t *p_media;
+ vlm_schedule_t *p_schedule;
- media = vlm_MediaSearch( vlm , p_command[1] );
- schedule = vlm_ScheduleSearch( vlm , p_command[1] );
+ if( i_command == 1 )
+ {
+ p_message = vlm_Show( p_vlm, NULL, NULL, NULL );
+ goto success;
+ }
+ else if( i_command > 2 ) goto syntax_error;
- if( schedule != NULL )
- {
- vlm_ScheduleDelete( vlm, schedule, NULL );
- message = vlm_MessageNew( "del" , NULL );
- i_return = 0;
- goto end_seq;
- }
- else if( media != NULL )
- {
- vlm_MediaDelete( vlm, media, NULL );
- message = vlm_MessageNew( "del" , NULL );
- i_return = 0;
- goto end_seq;
- }
- else if( strcmp(p_command[1] , "media") == 0 )
- {
- for( i = 0; i < vlm->i_media; i++ )
- {
- vlm_MediaDelete( vlm, vlm->media[i], NULL );
- }
- }
- else if( strcmp(p_command[1] , "schedule") == 0 )
- {
- for( i = 0; i < vlm->i_schedule; i++ )
- {
- vlm_ScheduleDelete( vlm, vlm->schedule[i], NULL );
- }
- }
- else if( strcmp(p_command[1] , "all") == 0 )
- {
- for( i = 0; i < vlm->i_media; i++ )
- {
- vlm_MediaDelete( vlm, vlm->media[i], NULL );
- }
+ p_media = vlm_MediaSearch( p_vlm, ppsz_command[1] );
+ p_schedule = vlm_ScheduleSearch( p_vlm, ppsz_command[1] );
- for( i = 0; i < vlm->i_schedule; i++ )
- {
- vlm_ScheduleDelete( vlm, vlm->schedule[i], NULL );
- }
- i_return = 0;
- goto end_seq;
- }
- else
- {
- char *error_message = malloc( strlen(p_command[1]) + strlen(": media unknown") + 1 );
- sprintf( error_message, "%s: media unknown" , p_command[1] );
- message = vlm_MessageNew( "del" , error_message );
- free( error_message );
- i_return = 1;
- goto end_seq;
- }
+ if( p_schedule != NULL )
+ {
+ p_message = vlm_Show( p_vlm, NULL, p_schedule, NULL );
+ }
+ else if( p_media != NULL )
+ {
+ p_message = vlm_Show( p_vlm, p_media, NULL, NULL );
}
else
{
- message = vlm_MessageNew( "setup" , "Wrong command syntax" );
- i_return = 1;
- goto end_seq;
+ p_message = vlm_Show( p_vlm, NULL, NULL, ppsz_command[1] );
}
+
+ goto success;
+ }
+
+ else if( !strcmp(ppsz_command[0], "help") )
+ {
+ if( i_command != 1 ) goto syntax_error;
+
+ p_message = vlm_Help( p_vlm, NULL );
+ goto success;
}
- else if( strcmp(p_command[0] , "show") == 0 )
+
+ else if( !strcmp(ppsz_command[0], "control") )
{
- if( i_command == 1 )
+ vlm_media_t *p_media;
+
+ if( i_command < 3 ) goto syntax_error;
+
+ if( !(p_media = vlm_MediaSearch( p_vlm, ppsz_command[1] ) ) )
{
- message = vlm_Show( vlm, NULL , NULL, NULL );
- i_return = 0;
- goto end_seq;
+ p_message = vlm_MessageNew( "control", "%s: media unknown",
+ ppsz_command[1] );
+ goto error;
}
- else if( i_command == 2 )
+ else
{
- vlm_media_t *media;
- vlm_schedule_t *schedule;
+ char *psz_command, *psz_arg = 0, *psz_instance = 0;
+ int i_index = 2;
- media = vlm_MediaSearch( vlm , p_command[1] );
- schedule = vlm_ScheduleSearch( vlm , p_command[1] );
-
- if( schedule != NULL )
- {
- message = vlm_Show( vlm, NULL, schedule, NULL );
- }
- else if( media != NULL )
- {
- message = vlm_Show( vlm, media, NULL, NULL );
- }
- else
+ if( strcmp( ppsz_command[2], "play" ) &&
+ strcmp( ppsz_command[2], "stop" ) &&
+ strcmp( ppsz_command[2], "pause" ) &&
+ strcmp( ppsz_command[2], "seek" ) )
{
- message = vlm_Show( vlm, NULL, NULL, p_command[1] );
+ i_index++;
+ psz_instance = ppsz_command[2];
+
+ if( i_command < 4 ) goto syntax_error;
}
- i_return = 0;
- goto end_seq;
- }
- else
- {
- message = vlm_MessageNew( "show" , "Wrong command syntax" );
- i_return = 1;
- goto end_seq;
+ psz_command = ppsz_command[i_index];
+
+ if( i_command >= i_index + 2 ) psz_arg = ppsz_command[i_index + 1];
+
+ vlm_MediaControl( p_vlm, p_media, psz_instance, psz_command,
+ psz_arg );
+ p_message = vlm_MessageNew( "control", NULL );
+ goto success;
}
}
- else if( strcmp(p_command[0] , "help") == 0 )
+
+ else if( !strcmp(ppsz_command[0], "save") )
{
- if( i_command == 1 )
+ if( i_command != 2 ) goto syntax_error;
+
+ if( vlm_Save( p_vlm, ppsz_command[1] ) )
{
- message = vlm_Help( vlm, NULL );
- i_return = 0;
- goto end_seq;
+ p_message = vlm_MessageNew( "save", "Unable to save to file" );
+ goto error;
}
else
{
- message = vlm_MessageNew( "help" , "Wrong command syntax" );
- i_return = 1;
- goto end_seq;
+ p_message = vlm_MessageNew( "save", NULL );
+ goto success;
}
}
- else if( strcmp(p_command[0] , "setup") == 0 )
+
+ else if( !strcmp(ppsz_command[0], "export" ) )
{
- if( i_command >= 2 )
- {
- vlm_media_t *media;
- vlm_schedule_t *schedule;
+ char *psz_buf;
- media = vlm_MediaSearch( vlm , p_command[1] );
- schedule = vlm_ScheduleSearch( vlm , p_command[1] );
+ if( i_command != 1 ) goto syntax_error;
- if( schedule != NULL )
- {
- for( i = 2 ; i < i_command ; i++ )
- {
- if( strcmp( p_command[i] , "enabled" ) == 0 || strcmp( p_command[i] , "disabled" ) == 0 )
- {
- vlm_ScheduleSetup( schedule, p_command[i], NULL );
- }
- /* Beware: evrything behind append is considered as command line */
- else if( strcmp( p_command[i] , "append" ) == 0 )
- {
- i++;
+ p_message = vlm_MessageNew( "export", psz_buf = Save( p_vlm ) );
+ free( psz_buf );
- if( i < i_command )
- {
- int j;
- for( j = (i + 1); j < i_command; j++ )
- {
- p_command[i] = realloc( p_command[i], strlen(p_command[i]) + strlen(p_command[j]) + 1 + 1);
- strcat( p_command[i], " " );
- strcat( p_command[i], p_command[j] );
- }
-
- vlm_ScheduleSetup( schedule, p_command[i - 1], p_command[i] );
- }
- i = i_command;
- }
- else
- {
- if( (i+1) < i_command )
- {
- vlm_ScheduleSetup( schedule, p_command[i], p_command[i+1] );
- i++;
- }
- else
- {
- vlm_ScheduleDelete( vlm, schedule, NULL );
- message = vlm_MessageNew( "setup" , "Wrong properties syntax" );
- i_return = 1;
- goto end_seq;
- }
- }
- }
-
- message = vlm_MessageNew( "setup" , NULL );
- i_return = 0;
- goto end_seq;
- }
- else if( media != NULL )
- {
- for( i = 2 ; i < i_command ; i++ )
- {
- if( strcmp( p_command[i] , "enabled" ) == 0 || strcmp( p_command[i] , "disabled" ) == 0 )
- { /* only one argument */
- vlm_MediaSetup( media, p_command[i], NULL );
- }
- else if( strcmp( p_command[i] , "loop" ) == 0 || strcmp( p_command[i] , "unloop" ) == 0 )
- {
- if( media->i_type != BROADCAST_TYPE )
- {
- message = vlm_MessageNew( "setup" , "lool only available for broadcast" );
- i_return = 1;
- goto end_seq;
- }
- else
- {
- vlm_MediaSetup( media, p_command[i], NULL );
- }
- }
- else
- {
- if( (i+1) < i_command )
- {
- vlm_MediaSetup( media, p_command[i], p_command[i+1] );
- i++;
- }
- else
- {
- vlm_MediaDelete( vlm, media, NULL );
- message = vlm_MessageNew( "setup" , "Wrong properties syntax" );
- i_return = 1;
- goto end_seq;
- }
- }
- }
+ goto success;
+ }
- message = vlm_MessageNew( "setup" , NULL );
- i_return = 0;
- goto end_seq;
- }
- else
- {
- char *error_message = malloc( strlen(p_command[1]) + strlen(" unknown") + 1 );
- sprintf( error_message, "%s unknown" , p_command[1] );
- message = vlm_MessageNew( "setup" , error_message );
- free( error_message );
- i_return = 1;
- goto end_seq;
- }
+ else if( !strcmp(ppsz_command[0], "load") )
+ {
+ if( i_command != 2 ) goto syntax_error;
- }
- else
+ switch( vlm_Load( p_vlm, ppsz_command[1] ) )
{
- message = vlm_MessageNew( "setup" , "Wrong command syntax" );
- i_return = 1;
- goto end_seq;
+ case 0:
+ p_message = vlm_MessageNew( "load", NULL );
+ goto success;
+ case 2:
+ p_message = vlm_MessageNew( "load", "Read file error" );
+ goto error;
+ case 3:
+ p_message =
+ vlm_MessageNew( "load", "Error while loading file" );
+ goto error;
+ default:
+ p_message =
+ vlm_MessageNew( "load", "Unable to load from file" );
+ goto error;
}
}
- else if( strcmp(p_command[0] , "control") == 0 )
- {
- if( i_command >= 3 )
- {
- vlm_media_t *media;
+ else
+ {
+ p_message = vlm_MessageNew( ppsz_command[0], "Unknown command" );
+ goto error;
+ }
- media = vlm_MediaSearch( vlm , p_command[1] );
+ /* Common code between "new" and "setup" */
+ if( !strcmp(ppsz_command[0], "new") ||
+ !strcmp(ppsz_command[0], "setup") )
+ {
+ int i_command_start = strcmp(ppsz_command[0], "new") ? 2 : 3;
+ vlm_media_t *p_media;
+ vlm_schedule_t *p_schedule;
- if( media == NULL )
- {
- char *error_message = malloc( strlen(p_command[1]) + strlen(": media unknown") + 1 );
- sprintf( error_message, "%s: media unknown" , p_command[1] );
- message = vlm_MessageNew( "control" , error_message );
- free( error_message );
- i_return = 1;
- goto end_seq;
- }
- else
- {
- char *psz_args;
+ if( i_command < i_command_start ) goto syntax_error;
- if( i_command >= 4 )
- {
- psz_args = p_command[3];
- }
- else
- {
- psz_args = NULL;
- }
+ p_media = vlm_MediaSearch( p_vlm, ppsz_command[1] );
+ p_schedule = vlm_ScheduleSearch( p_vlm, ppsz_command[1] );
- /* for now */
- vlm_MediaControl( vlm, media, p_command[2], psz_args );
- message = vlm_MessageNew( "control" , NULL );
- i_return = 0;
- goto end_seq;
- }
- }
- else
+ if( !p_media && !p_schedule )
{
- message = vlm_MessageNew( "control" , "Wrong command syntax" );
- i_return = 1;
- goto end_seq;
+ p_message = vlm_MessageNew( ppsz_command[0], "%s unknown",
+ ppsz_command[1] );
+ goto error;
}
- }
- else if( strcmp(p_command[0] , "save") == 0 )
- {
- if( i_command == 2 )
- {
- FILE *file;
+ if( p_schedule != NULL )
+ {
+ for( i = i_command_start ; i < i_command ; i++ )
+ {
+ if( !strcmp( ppsz_command[i], "enabled" ) ||
+ !strcmp( ppsz_command[i], "disabled" ) )
+ {
+ vlm_ScheduleSetup( p_schedule, ppsz_command[i], NULL );
+ }
- file = fopen( p_command[1], "w" );
+ /* Beware: everything behind append is considered as
+ * command line */
+ else if( !strcmp( ppsz_command[i], "append" ) )
+ {
+ if( ++i >= i_command ) break;
- if( file == NULL )
- {
- message = vlm_MessageNew( "save" , "Unable to save file" );
- i_return = 1;
- goto end_seq;
- }
- else
- {
- char *save;
+ for( j = i + 1; j < i_command; j++ )
+ {
+ ppsz_command[i] =
+ realloc( ppsz_command[i], strlen(ppsz_command[i]) +
+ strlen(ppsz_command[j]) + 1 + 1 );
+ strcat( ppsz_command[i], " " );
+ strcat( ppsz_command[i], ppsz_command[j] );
+ }
- save = vlm_Save( vlm );
+ vlm_ScheduleSetup( p_schedule, ppsz_command[i - 1],
+ ppsz_command[i] );
+ break;
+ }
+ else
+ {
+ if( i + 1 >= i_command && !strcmp(ppsz_command[0], "new") )
+ {
+ vlm_ScheduleDelete( p_vlm, p_schedule, NULL );
+ p_message =
+ vlm_MessageNew( ppsz_command[0],
+ "Wrong properties syntax" );
+ goto error;
+ }
+ else if( i + 1 >= i_command )
+ {
+ p_message =
+ vlm_MessageNew( ppsz_command[0],
+ "Wrong properties syntax" );
+ goto error;
+ }
- fwrite( save, strlen( save ) , 1 , file );
- fclose( file );
- free( save );
- message = vlm_MessageNew( "save" , NULL );
- i_return = 0;
- goto end_seq;
+ vlm_ScheduleSetup( p_schedule, ppsz_command[i],
+ ppsz_command[i+1] );
+ i++;
+ }
}
}
- else
- {
- message = vlm_MessageNew( "save" , "Wrong command" );
- i_return = 1;
- goto end_seq;
- }
- }
- else if( strcmp(p_command[0] , "load") == 0 )
- {
- if( i_command == 2 )
+ else if( p_media != NULL )
{
- FILE *file;
-
- file = fopen( p_command[1], "r" );
-
- if( file == NULL )
- {
- message = vlm_MessageNew( "load" , "Unable to load file" );
- i_return = 1;
- goto end_seq;
- }
- else
+ for( i = i_command_start ; i < i_command ; i++ )
{
- int64_t size;
- char *buffer;
-
- if( fseek( file, 0, SEEK_END) == 0 )
+ if( !strcmp( ppsz_command[i], "enabled" ) ||
+ !strcmp( ppsz_command[i], "disabled" ) )
+ {
+ vlm_MediaSetup( p_vlm, p_media, ppsz_command[i], NULL );
+ }
+ else if( i + 1 >= i_command &&
+ !strcmp( ppsz_command[i], "mux") )
{
- size = ftell( file );
- fseek( file, 0, SEEK_SET);
- buffer = malloc( size + 1 );
- fread( buffer, 1, size, file);
- buffer[ size ] = '\0';
- if( vlm_Load( vlm, buffer ) )
+ if( p_media->i_type != VOD_TYPE )
{
- free( buffer );
- message = vlm_MessageNew( "load" , "error while loading file" );
- i_return = 1;
- goto end_seq;
+ p_message = vlm_MessageNew( ppsz_command[0],
+ "mux only available for broadcast" );
+ }
+ else
+ {
+ vlm_MediaSetup( p_vlm, p_media, ppsz_command[i],
+ ppsz_command[i+1] );
+ i++;
+ }
+ }
+ else if( !strcmp( ppsz_command[i], "loop" ) ||
+ !strcmp( ppsz_command[i], "unloop" ) )
+ {
+ if( p_media->i_type != BROADCAST_TYPE )
+ {
+ p_message = vlm_MessageNew( ppsz_command[0],
+ "loop only available for broadcast" );
+ }
+ else
+ {
+ vlm_MediaSetup( p_vlm, p_media, ppsz_command[i], NULL );
}
- free( buffer );
}
else
{
- message = vlm_MessageNew( "load" , "read file error" );
- i_return = 1;
- goto end_seq;
+ if( ( (i + 1) >= i_command ) &&
+ !strcmp(ppsz_command[0], "new") )
+ {
+ vlm_MediaDelete( p_vlm, p_media, NULL );
+ p_message =
+ vlm_MessageNew( ppsz_command[0],
+ "Wrong properties syntax" );
+ goto error;
+ }
+ else if( (i + 1) >= i_command )
+ {
+ p_message =
+ vlm_MessageNew( ppsz_command[0],
+ "Wrong properties syntax" );
+ goto error;
+ }
+
+ vlm_MediaSetup( p_vlm, p_media, ppsz_command[i],
+ ppsz_command[i+1] );
+ i++;
}
- fclose( file );
- message = vlm_MessageNew( "load" , NULL );
- i_return = 0;
- goto end_seq;
}
}
- else
- {
- message = vlm_MessageNew( "load" , "Wrong command" );
- i_return = 1;
- goto end_seq;
- }
- }
- else
- {
- message = vlm_MessageNew( p_command[0] , "Unknown comand" );
- i_return = 1;
- goto end_seq;
+
+ p_message = vlm_MessageNew( ppsz_command[0], NULL );
+ goto success;
}
-end_seq:
+success:
+ for( i = 0 ; i < i_command ; i++ ) FREENULL( ppsz_command[i] );
+ FREENULL( ppsz_command );
+ *pp_message = p_message;
- for( i = 0 ; i < i_command ; i++ )
- {
- free( p_command[i] );
- }
+ return VLC_SUCCESS;
- *p_message = message;
+syntax_error:
+ p_message = vlm_MessageNew( ppsz_command[0], "Wrong command syntax" );
- return i_return;
-}
+error:
+ for( i = 0 ; i < i_command ; i++ ) FREENULL( ppsz_command[i] );
+ FREENULL( ppsz_command );
+ *pp_message = p_message;
+ return VLC_EGENERIC;
+}
-static vlm_media_t *vlm_MediaSearch( vlm_t *vlm, char *psz_name )
+vlm_media_t *vlm_MediaSearch( vlm_t *vlm, const char *psz_name )
{
int i;
return NULL;
}
+/*****************************************************************************
+ * Media handling
+ *****************************************************************************/
+static vlm_media_instance_t *
+vlm_MediaInstanceSearch( vlm_t *vlm, vlm_media_t *media,
+ const char *psz_name )
+{
+ int i;
+
+ for( i = 0; i < media->i_instance; i++ )
+ {
+ if( ( !psz_name && !media->instance[i]->psz_name ) ||
+ ( psz_name && media->instance[i]->psz_name &&
+ !strcmp( psz_name, media->instance[i]->psz_name ) ) )
+ {
+ return media->instance[i];
+ }
+ }
+
+ return NULL;
+}
-static vlm_media_t *vlm_MediaNew( vlm_t *vlm , char *psz_name, int i_type )
+vlm_media_t *vlm_MediaNew( vlm_t *vlm, const char *psz_name, int i_type )
{
- vlm_media_t *media= malloc( sizeof( vlm_media_t ));
+ vlm_media_t *media = malloc( sizeof( vlm_media_t ) );
+
+ if( !media )
+ {
+ msg_Err( vlm, "out of memory" );
+ return NULL;
+ }
+
+ /* Check if we need to load the VOD server */
+ if( i_type == VOD_TYPE && !vlm->i_vod )
+ {
+ vlm->vod = vlc_object_create( vlm, VLC_OBJECT_VOD );
+ vlc_object_attach( vlm->vod, vlm );
+ vlm->vod->p_module = module_Need( vlm->vod, "vod server", 0, 0 );
+ if( !vlm->vod->p_module )
+ {
+ msg_Err( vlm, "cannot find vod server" );
+ vlc_object_detach( vlm->vod );
+ vlc_object_destroy( vlm->vod );
+ vlm->vod = 0;
+ free( media );
+ return NULL;
+ }
+
+ vlm->vod->p_data = vlm;
+ vlm->vod->pf_media_control = vlm_MediaVodControl;
+ }
+
+ if( i_type == VOD_TYPE ) vlm->i_vod++;
media->psz_name = strdup( psz_name );
media->b_enabled = VLC_FALSE;
media->b_loop = VLC_FALSE;
+ media->vod_media = NULL;
+ media->psz_vod_output = NULL;
+ media->psz_mux = NULL;
media->i_input = 0;
media->input = NULL;
- media->i_index = 0;
media->psz_output = NULL;
media->i_option = 0;
media->option = NULL;
media->i_type = i_type;
- media->p_input = NULL;
+ media->i_instance = 0;
+ media->instance = NULL;
- media->item.psz_uri = strdup( psz_name );
- media->item.psz_name = NULL;
- media->item.i_duration = -1;
- media->item.ppsz_options = NULL;
- media->item.i_options = 0;
- media->item.i_categories = 0;
- media->item.pp_categories = NULL;
- vlc_mutex_init( vlm, &media->item.lock );
+ vlc_input_item_Init( VLC_OBJECT(vlm), &media->item );
TAB_APPEND( vlm->i_media, vlm->media, media );
return media;
}
-
/* for now, simple delete. After, del with options (last arg) */
-static int vlm_MediaDelete( vlm_t *vlm, vlm_media_t *media, char *psz_name )
+void vlm_MediaDelete( vlm_t *vlm, vlm_media_t *media, const char *psz_name )
{
- int i;
+ if( media == NULL ) return;
- if( media == NULL )
+ while( media->i_instance )
{
- return 1;
+ vlm_media_instance_t *p_instance = media->instance[0];
+ vlm_MediaControl( vlm, media, p_instance->psz_name, "stop", 0 );
}
- if( media->p_input )
- {
- input_StopThread( media->p_input );
+ TAB_REMOVE( vlm->i_media, vlm->media, media );
- input_DestroyThread( media->p_input );
- vlc_object_detach( media->p_input );
- vlc_object_destroy( media->p_input );
+ if( media->i_type == VOD_TYPE )
+ {
+ vlm_MediaSetup( vlm, media, "disabled", 0 );
+ vlm->i_vod--;
}
- TAB_REMOVE( vlm->i_media, vlm->media , media );
+ /* Check if we need to unload the VOD server */
+ if( media->i_type == VOD_TYPE && !vlm->i_vod )
+ {
+ module_Unneed( vlm->vod, vlm->vod->p_module );
+ vlc_object_detach( vlm->vod );
+ vlc_object_destroy( vlm->vod );
+ vlm->vod = 0;
+ }
if( vlm->i_media == 0 && vlm->media ) free( vlm->media );
free( media->psz_name );
- for( i = 0; i < media->i_input; i++ )
- {
- free( media->input[i] );
- }
+ while( media->i_input-- ) free( media->input[media->i_input] );
if( media->input ) free( media->input );
if( media->psz_output ) free( media->psz_output );
+ if( media->psz_mux ) free( media->psz_mux );
- for( i = 0; i < media->i_option; i++ )
- {
- free( media->option[i] );
- }
- if(media->option) free( media->option );
+ while( media->i_option-- ) free( media->option[media->i_option] );
+ if( media->option ) free( media->option );
- if( media->item.psz_uri ) free( media->item.psz_uri );
- if( media->item.psz_name ) free( media->item.psz_name );
- vlc_mutex_destroy( &media->item.lock );
- for( i = 0; i < media->item.i_options; i++ )
- {
- free( media->item.ppsz_options[i] );
- }
- if( media->item.ppsz_options ) free( media->item.ppsz_options );
- /* FIXME: free the info categories. */
+ vlc_input_item_Clean( &media->item );
free( media );
-
- return 0;
}
-
-static int vlm_MediaSetup( vlm_media_t *media, char *psz_cmd, char *psz_value )
+int vlm_MediaSetup( vlm_t *vlm, vlm_media_t *media, const char *psz_cmd,
+ const char *psz_value )
{
- if( strcmp( psz_cmd, "loop" ) == 0 )
+ if( !psz_cmd) return VLC_EGENERIC;
+
+ if( !strcmp( psz_cmd, "loop" ) )
{
media->b_loop = VLC_TRUE;
}
- else if( strcmp( psz_cmd, "unloop" ) == 0 )
+ else if( !strcmp( psz_cmd, "unloop" ) )
{
media->b_loop = VLC_FALSE;
}
- else if( strcmp( psz_cmd, "enabled" ) == 0 )
+ else if( !strcmp( psz_cmd, "enabled" ) )
{
media->b_enabled = VLC_TRUE;
}
- else if( strcmp( psz_cmd, "disabled" ) == 0 )
+ else if( !strcmp( psz_cmd, "disabled" ) )
{
media->b_enabled = VLC_FALSE;
}
- else if( strcmp( psz_cmd, "input" ) == 0 )
+ else if( !strcmp( psz_cmd, "mux" ) )
+ {
+ if( media->psz_mux ) free( media->psz_mux );
+ media->psz_mux = NULL;
+ if( psz_value ) media->psz_mux = strdup( psz_value );
+ }
+ else if( !strcmp( psz_cmd, "input" ) )
{
char *input;
- if( psz_value != NULL && strlen(psz_value) > 1 && ( psz_value[0] == '\'' || psz_value[0] == '\"' )
- && ( psz_value[ strlen(psz_value) - 1 ] == '\'' || psz_value[ strlen(psz_value) - 1 ] == '\"' ) )
+ if( psz_value != NULL && strlen(psz_value) > 1 &&
+ ( psz_value[0] == '\'' || psz_value[0] == '\"' ) &&
+ ( psz_value[ strlen(psz_value) - 1 ] == '\'' ||
+ psz_value[ strlen(psz_value) - 1 ] == '\"' ) )
{
input = malloc( strlen(psz_value) - 1 );
- memcpy( input , psz_value + 1 , strlen(psz_value) - 2 );
+ memcpy( input, psz_value + 1, strlen(psz_value) - 2 );
input[ strlen(psz_value) - 2 ] = '\0';
}
else
TAB_APPEND( media->i_input, media->input, input );
}
- else if( strcmp( psz_cmd, "output" ) == 0 )
+ else if( !strcmp( psz_cmd, "inputdel" ) && !strcmp( psz_value, "all" ) )
+ {
+ while( media->i_input > 0 )
+ {
+ TAB_REMOVE( media->i_input, media->input, media->input[0] );
+ }
+ }
+ else if( !strcmp( psz_cmd, "inputdel" ) )
+ {
+ char *input;
+ int i;
+
+ if( psz_value != NULL && strlen(psz_value) > 1 &&
+ ( psz_value[0] == '\'' || psz_value[0] == '\"' ) &&
+ ( psz_value[ strlen(psz_value) - 1 ] == '\'' ||
+ psz_value[ strlen(psz_value) - 1 ] == '\"' ) )
+ {
+ input = malloc( strlen(psz_value) - 1 );
+
+ memcpy( input, psz_value + 1, strlen(psz_value) - 2 );
+ input[ strlen(psz_value) - 2 ] = '\0';
+ }
+ else
+ {
+ input = strdup( psz_value );
+ }
+
+ for( i = 0; i < media->i_input; i++ )
+ {
+ if( !strcmp( input, media->input[i] ) )
+ {
+ TAB_REMOVE( media->i_input, media->input, media->input[i] );
+ break;
+ }
+ }
+ }
+ else if( !strcmp( psz_cmd, "inputdeln" ) )
+ {
+ int index = atoi( psz_value );
+ if( index > 0 && index <= media->i_input )
+ {
+ TAB_REMOVE( media->i_input, media->input, media->input[index-1] );
+ }
+ }
+ else if( !strcmp( psz_cmd, "output" ) )
{
if( media->psz_output != NULL )
{
}
media->psz_output = strdup( psz_value );
}
- else if( strcmp( psz_cmd, "option" ) == 0 )
+ else if( !strcmp( psz_cmd, "option" ) )
{
- char *option;
- option = strdup( psz_value );
+ char *psz_option;
+ psz_option = strdup( psz_value );
- TAB_APPEND( media->i_option, media->option, option );
+ TAB_APPEND( media->i_option, media->option, psz_option );
}
else
{
- return 1;
+ return VLC_EGENERIC;
}
- return 0;
-}
-static int vlm_MediaControl( vlm_t *vlm, vlm_media_t *media, char *psz_name,
- char *psz_args )
-{
- if( strcmp( psz_name, "play" ) == 0 )
+ /* Check if we need to create/delete a vod media */
+ if( media->i_type == VOD_TYPE )
{
- int i;
-
- if( media->b_enabled == VLC_TRUE && media->i_input > 0 )
+ if( !media->b_enabled && media->vod_media )
{
- if( psz_args != NULL && sscanf( psz_args, "%d", &i ) == 1 &&
- i < media->i_input )
- {
- media->i_index = i;
- }
- else
- {
- media->i_index = 0;
- }
+ vlm->vod->pf_media_del( vlm->vod, media->vod_media );
+ media->vod_media = 0;
+ }
+ else if( media->b_enabled && !media->vod_media && media->i_input )
+ {
+ /* Pre-parse the input */
+ input_thread_t *p_input;
+ char *psz_output;
+ char *psz_header;
+ int i;
- /* FIXME!!! we need an input_item_t per input spawned */
- //input_ItemNew( &media->item );
- if( media->psz_output != NULL )
- {
- media->item.ppsz_options = malloc( sizeof( char* ) );
- media->item.ppsz_options[0] =
- malloc( strlen(media->psz_output) + sizeof("sout=") );
- sprintf( media->item.ppsz_options[0], "sout=%s",
- media->psz_output );
- media->item.i_options = 1;
- }
+ vlc_input_item_Clean( &media->item );
+ vlc_input_item_Init( VLC_OBJECT(vlm), &media->item );
+
+ if( media->psz_output )
+ asprintf( &psz_output, "%s:description", media->psz_output );
else
- {
- media->item.ppsz_options = NULL;
- media->item.i_options = 0;
- }
+ asprintf( &psz_output, "#description" );
+ media->item.psz_uri = strdup( media->input[0] );
+ media->item.ppsz_options = malloc( sizeof( char* ) );
+ asprintf( &media->item.ppsz_options[0], "sout=%s", psz_output);
+ media->item.i_options = 1;
for( i = 0; i < media->i_option; i++ )
{
media->item.i_options++;
strdup( media->option[i] );
}
- media->p_input = input_CreateThread( vlm, &media->item );
-
- return 0;
- }
- else
- {
- return 1;
- }
- }
- else if( strcmp( psz_name, "seek" ) == 0 )
- {
- vlc_value_t val;
- float f_percentage;
-
- if( psz_args && sscanf( psz_args, "%f", &f_percentage ) == 1 )
- {
- val.f_float = f_percentage / 100.0 ;
- var_Set( media->p_input, "position", val );
- return 0;
- }
- }
- else if( strcmp( psz_name, "stop" ) == 0 )
- {
- /* FIXME!!! we need an input_item_t per input spawned */
- if( media->p_input )
- {
- input_StopThread( media->p_input );
- input_DestroyThread( media->p_input );
- vlc_object_detach( media->p_input );
- vlc_object_destroy( media->p_input );
- media->p_input = NULL;
-
- //input_ItemDelete( &media->item );
- }
-
- return 0;
- }
- else if( strcmp( psz_name, "pause" ) == 0 )
- {
- vlc_value_t val;
-
- val.i_int = 0;
-
- if( media->p_input != NULL )
- {
- var_Get( media->p_input, "state", &val );
- }
+ asprintf( &psz_header, _("Media: %s"), media->psz_name );
- if( val.i_int == PAUSE_S )
- {
- if( media->p_input )
+ if( (p_input = input_CreateThread2( vlm, &media->item, psz_header
+ ) ) )
{
- val.i_int = PLAYING_S;
- var_Set( media->p_input, "state", val );
+ while( !p_input->b_eof && !p_input->b_error ) msleep( 100000 );
+
+ input_StopThread( p_input );
+ input_DestroyThread( p_input );
+ vlc_object_detach( p_input );
+ vlc_object_destroy( p_input );
}
- }
- else
- {
- if( media->p_input )
+ free( psz_output );
+ free( psz_header );
+
+ if( media->psz_mux )
{
- val.i_int = PAUSE_S;
- var_Set( media->p_input, "state", val );
+ input_item_t item;
+ es_format_t es, *p_es = &es;
+ char fourcc[5];
+
+ sprintf( fourcc, "%4.4s", media->psz_mux );
+ fourcc[0] = tolower(fourcc[0]); fourcc[1] = tolower(fourcc[1]);
+ fourcc[2] = tolower(fourcc[2]); fourcc[3] = tolower(fourcc[3]);
+
+ item = media->item;
+ item.i_es = 1;
+ item.es = &p_es;
+ es_format_Init( &es, VIDEO_ES, *((int *)fourcc) );
+
+ media->vod_media =
+ vlm->vod->pf_media_new( vlm->vod, media->psz_name, &item );
+ return VLC_SUCCESS;
}
+
+ media->vod_media =
+ vlm->vod->pf_media_new( vlm->vod, media->psz_name,
+ &media->item );
}
- return 0;
}
- return 1;
+ return VLC_SUCCESS;
}
-static vlm_message_t *vlm_Show( vlm_t *vlm, vlm_media_t *media, vlm_schedule_t *schedule, char *psz_filter )
+int vlm_MediaControl( vlm_t *vlm, vlm_media_t *media, const char *psz_id,
+ const char *psz_command, const char *psz_args )
{
+ vlm_media_instance_t *p_instance;
+ int i;
+ char *psz_header;
- if( media != NULL )
- {
- int i;
- vlm_message_t *message;
- vlm_message_t *message_media;
- vlm_message_t *message_child;
+ p_instance = vlm_MediaInstanceSearch( vlm, media, psz_id );
- message = vlm_MessageNew( "show" , NULL );
- message_media = vlm_MessageAdd( message , vlm_MessageNew( media->psz_name , NULL ) );
+ if( !strcmp( psz_command, "play" ) )
+ {
+ if( !media->b_enabled || media->i_input == 0 ) return 0;
- if( media->i_type == VOD_TYPE )
- {
- vlm_MessageAdd( message_media , vlm_MessageNew( "type" , "vod" ) );
- }
- else
+ if( !p_instance )
{
- vlm_MessageAdd( message_media , vlm_MessageNew( "type" , "broadcast" ) );
- }
+ p_instance = malloc( sizeof(vlm_media_instance_t) );
+ if( !p_instance ) return VLC_EGENERIC;
+ memset( p_instance, 0, sizeof(vlm_media_instance_t) );
+ vlc_input_item_Init( VLC_OBJECT(vlm), &p_instance->item );
+ p_instance->p_input = NULL;
- vlm_MessageAdd( message_media , vlm_MessageNew( "enabled" , media->b_enabled ? "yes" : "no" ) );
+ if( ( media->psz_output != NULL ) || ( media->psz_vod_output != NULL ) )
+ {
+ p_instance->item.ppsz_options = malloc( sizeof( char* ) );
+ asprintf( &p_instance->item.ppsz_options[0], "sout=%s%s%s",
+ media->psz_output ? media->psz_output : "",
+ (media->psz_output && media->psz_vod_output) ?
+ ":" : media->psz_vod_output ? "#" : "",
+ media->psz_vod_output ? media->psz_vod_output : "" );
+ p_instance->item.i_options = 1;
+ }
- vlm_MessageAdd( message_media, vlm_MessageNew( "loop" , media->b_loop ? "yes" : "no" ) );
+ for( i = 0; i < media->i_option; i++ )
+ {
+ p_instance->item.i_options++;
+ p_instance->item.ppsz_options =
+ realloc( p_instance->item.ppsz_options,
+ p_instance->item.i_options * sizeof( char* ) );
+ p_instance->item.ppsz_options[p_instance->item.i_options - 1] =
+ strdup( media->option[i] );
+ }
- message_child = vlm_MessageAdd( message_media , vlm_MessageNew( "inputs" , NULL ) );
+ p_instance->psz_name = psz_id ? strdup( psz_id ) : NULL;
+ TAB_APPEND( media->i_instance, media->instance, p_instance );
+ }
- for( i=0 ; i < (media->i_input) ; i++ )
+ if( ( psz_args && sscanf(psz_args, "%d", &i) == 1 ) && ( i < media->i_input ) )
{
- vlm_MessageAdd( message_child , vlm_MessageNew( media->input[i] , NULL ) );
+ p_instance->i_index = i;
}
- vlm_MessageAdd( message_media , vlm_MessageNew( "output" , media->psz_output ? media->psz_output : "" ) );
+ if( p_instance->item.psz_uri ) free( p_instance->item.psz_uri );
+ p_instance->item.psz_uri =
+ strdup( media->input[p_instance->i_index] );
- message_child = vlm_MessageAdd( message_media , vlm_MessageNew( "options" , NULL ) );
-
- for( i=0 ; i < (media->i_option) ; i++ )
+ if( p_instance->p_input )
{
- vlm_MessageAdd( message_child , vlm_MessageNew( media->option[i] , NULL ) );
+ input_StopThread( p_instance->p_input );
+ input_DestroyThread( p_instance->p_input );
+ vlc_object_detach( p_instance->p_input );
+ vlc_object_destroy( p_instance->p_input );
}
- if( media->p_input != NULL )
+ asprintf( &psz_header, _("Media: %s"), media->psz_name );
+ p_instance->p_input = input_CreateThread2( vlm, &p_instance->item,
+ psz_header );
+ if( !p_instance->p_input )
{
- vlc_value_t val;
+ TAB_REMOVE( media->i_instance, media->instance, p_instance );
+ vlc_input_item_Clean( &p_instance->item );
+ if( p_instance->psz_name ) free( p_instance->psz_name );
+ }
+ free( psz_header );
- var_Get( media->p_input, "state", &val );
+ return VLC_SUCCESS;
+ }
- if( val.i_int == PLAYING_S )
- {
- vlm_MessageAdd( message_media , vlm_MessageNew( "state" , "playing" ) );
- }
- else if( val.i_int == PAUSE_S )
+ if( !p_instance ) return VLC_EGENERIC;
+
+ if( !strcmp( psz_command, "seek" ) )
+ {
+ vlc_value_t val;
+ float f_percentage;
+
+ if( psz_args )
+ {
+ f_percentage = i18n_atof( psz_args );
+ if( f_percentage >= 0.0 && f_percentage <= 100.0 )
{
- vlm_MessageAdd( message_media , vlm_MessageNew( "state" , "paused" ) );
+ val.f_float = f_percentage / 100.0 ;
+ var_Set( p_instance->p_input, "position", val );
+ return VLC_SUCCESS;
}
- else
+ }
+ }
+ else if( !strcmp( psz_command, "rewind" ) )
+ {
+ float f_pos;
+ float f_scale;
+ vlc_value_t val;
+
+ if( psz_args )
+ {
+ f_scale = i18n_atof( psz_args );
+ f_pos = var_GetFloat( p_instance->p_input, "position" );
+ val.f_float = f_pos - (f_scale / 1000.0);
+ if( val.f_float < 0.0 )
+ val.f_float = 0.0;
+ var_Set( p_instance->p_input, "position", val );
+ return VLC_SUCCESS;
+ }
+ }
+ else if( !strcmp( psz_command, "forward" ) )
+ {
+ float f_pos;
+ float f_scale;
+ vlc_value_t val;
+
+ if( psz_args )
+ {
+ f_scale = i18n_atof( psz_args );
+ f_pos = var_GetFloat( p_instance->p_input, "position" );
+ val.f_float = f_pos + (f_scale / 1000.0);
+ if( val.f_float > 1.0 )
+ val.f_float = 1.0;
+ var_Set( p_instance->p_input, "position", val );
+ return VLC_SUCCESS;
+ }
+ }
+ else if( !strcmp( psz_command, "stop" ) )
+ {
+ TAB_REMOVE( media->i_instance, media->instance, p_instance );
+
+ if( p_instance->p_input )
+ {
+ input_StopThread( p_instance->p_input );
+ input_DestroyThread( p_instance->p_input );
+ vlc_object_detach( p_instance->p_input );
+ vlc_object_destroy( p_instance->p_input );
+ }
+
+ vlc_input_item_Clean( &p_instance->item );
+ if( p_instance->psz_name ) free( p_instance->psz_name );
+ free( p_instance );
+
+ return VLC_SUCCESS;
+ }
+ else if( !strcmp( psz_command, "pause" ) )
+ {
+ vlc_value_t val;
+
+ if( !p_instance->p_input ) return VLC_SUCCESS;
+
+ var_Get( p_instance->p_input, "state", &val );
+
+ if( val.i_int == PAUSE_S ) val.i_int = PLAYING_S;
+ else val.i_int = PAUSE_S;
+ var_Set( p_instance->p_input, "state", val );
+
+ return VLC_SUCCESS;
+ }
+
+ return VLC_EGENERIC;
+}
+
+/*****************************************************************************
+ * Schedule handling
+ *****************************************************************************/
+static int64_t vlm_Date()
+{
+#ifdef WIN32
+ struct timeb tm;
+ ftime( &tm );
+ return ((int64_t)tm.time) * 1000000 + ((int64_t)tm.millitm) * 1000;
+#else
+ return mdate();
+#endif
+}
+
+vlm_schedule_t *vlm_ScheduleNew( vlm_t *vlm, const char *psz_name )
+{
+ vlm_schedule_t *p_sched = malloc( sizeof( vlm_schedule_t ) );
+
+ if( !p_sched )
+ {
+ return NULL;
+ }
+
+ if( !psz_name )
+ {
+ return NULL;
+ }
+
+ p_sched->psz_name = strdup( psz_name );
+ p_sched->b_enabled = VLC_FALSE;
+ p_sched->i_command = 0;
+ p_sched->command = NULL;
+ p_sched->i_date = 0;
+ p_sched->i_period = 0;
+ p_sched->i_repeat = -1;
+
+ TAB_APPEND( vlm->i_schedule, vlm->schedule, p_sched );
+
+ return p_sched;
+}
+
+/* for now, simple delete. After, del with options (last arg) */
+void vlm_ScheduleDelete( vlm_t *vlm, vlm_schedule_t *sched,
+ const char *psz_name )
+{
+ if( sched == NULL ) return;
+
+ TAB_REMOVE( vlm->i_schedule, vlm->schedule, sched );
+
+ if( vlm->i_schedule == 0 && vlm->schedule ) free( vlm->schedule );
+ free( sched->psz_name );
+ while( sched->i_command )
+ {
+ char *psz_cmd = sched->command[0];
+ TAB_REMOVE( sched->i_command, sched->command, psz_cmd );
+ free( psz_cmd );
+ }
+ free( sched );
+}
+
+static vlm_schedule_t *vlm_ScheduleSearch( vlm_t *vlm, const char *psz_name )
+{
+ int i;
+
+ for( i = 0; i < vlm->i_schedule; i++ )
+ {
+ if( strcmp( psz_name, vlm->schedule[i]->psz_name ) == 0 )
+ {
+ return vlm->schedule[i];
+ }
+ }
+
+ return NULL;
+}
+
+/* Ok, setup schedule command will be able to support only one (argument value) at a time */
+int vlm_ScheduleSetup( vlm_schedule_t *schedule, const char *psz_cmd,
+ const char *psz_value )
+{
+ if( !strcmp( psz_cmd, "enabled" ) )
+ {
+ schedule->b_enabled = VLC_TRUE;
+ }
+ else if( !strcmp( psz_cmd, "disabled" ) )
+ {
+ schedule->b_enabled = VLC_FALSE;
+ }
+#if !defined( UNDER_CE )
+ else if( !strcmp( psz_cmd, "date" ) )
+ {
+ struct tm time;
+ const char *p;
+ time_t date;
+
+ time.tm_sec = 0; /* seconds */
+ time.tm_min = 0; /* minutes */
+ time.tm_hour = 0; /* hours */
+ time.tm_mday = 0; /* day of the month */
+ time.tm_mon = 0; /* month */
+ time.tm_year = 0; /* year */
+ time.tm_wday = 0; /* day of the week */
+ time.tm_yday = 0; /* day in the year */
+ time.tm_isdst = -1; /* daylight saving time */
+
+ /* date should be year/month/day-hour:minutes:seconds */
+ p = strchr( psz_value, '-' );
+
+ if( !strcmp( psz_value, "now" ) )
+ {
+ schedule->i_date = 0;
+ }
+ else if( (p == NULL) && sscanf( psz_value, "%d:%d:%d", &time.tm_hour,
+ &time.tm_min, &time.tm_sec ) != 3 )
+ /* it must be a hour:minutes:seconds */
+ {
+ return 1;
+ }
+ else
+ {
+ unsigned i,j,k;
+
+ switch( sscanf( p + 1, "%u:%u:%u", &i, &j, &k ) )
+ {
+ case 1:
+ time.tm_sec = i;
+ break;
+ case 2:
+ time.tm_min = i;
+ time.tm_sec = j;
+ break;
+ case 3:
+ time.tm_hour = i;
+ time.tm_min = j;
+ time.tm_sec = k;
+ break;
+ default:
+ return 1;
+ }
+
+ switch( sscanf( psz_value, "%d/%d/%d", &i, &j, &k ) )
{
- vlm_MessageAdd( message_media , vlm_MessageNew( "state" , "stop" ) );
+ case 1:
+ time.tm_mday = i;
+ break;
+ case 2:
+ time.tm_mon = i - 1;
+ time.tm_mday = j;
+ break;
+ case 3:
+ time.tm_year = i - 1900;
+ time.tm_mon = j - 1;
+ time.tm_mday = k;
+ break;
+ default:
+ return 1;
}
+
+ date = mktime( &time );
+ schedule->i_date = ((mtime_t) date) * 1000000;
+ }
+ }
+ else if( !strcmp( psz_cmd, "period" ) )
+ {
+ struct tm time;
+ const char *p;
+ const char *psz_time = NULL, *psz_date = NULL;
+ time_t date;
+ unsigned i,j,k;
+
+ /* First, if date or period are modified, repeat should be equal to -1 */
+ schedule->i_repeat = -1;
+
+ time.tm_sec = 0; /* seconds */
+ time.tm_min = 0; /* minutes */
+ time.tm_hour = 0; /* hours */
+ time.tm_mday = 0; /* day of the month */
+ time.tm_mon = 0; /* month */
+ time.tm_year = 0; /* year */
+ time.tm_wday = 0; /* day of the week */
+ time.tm_yday = 0; /* day in the year */
+ time.tm_isdst = -1; /* daylight saving time */
+
+ /* date should be year/month/day-hour:minutes:seconds */
+ p = strchr( psz_value, '-' );
+ if( p )
+ {
+ psz_date = psz_value;
+ psz_time = p + 1;
}
else
{
- vlm_MessageAdd( message_media , vlm_MessageNew( "state" , "stop" ) );
+ psz_time = psz_value;
}
- return message;
+ switch( sscanf( psz_time, "%u:%u:%u", &i, &j, &k ) )
+ {
+ case 1:
+ time.tm_sec = i;
+ break;
+ case 2:
+ time.tm_min = i;
+ time.tm_sec = j;
+ break;
+ case 3:
+ time.tm_hour = i;
+ time.tm_min = j;
+ time.tm_sec = k;
+ break;
+ default:
+ return 1;
+ }
+ if( psz_date )
+ {
+ switch( sscanf( psz_date, "%u/%u/%u", &i, &j, &k ) )
+ {
+ case 1:
+ time.tm_mday = i;
+ break;
+ case 2:
+ time.tm_mon = i;
+ time.tm_mday = j;
+ break;
+ case 3:
+ time.tm_year = i;
+ time.tm_mon = j;
+ time.tm_mday = k;
+ break;
+ default:
+ return 1;
+ }
+ }
+ /* ok, that's stupid... who is going to schedule streams every 42 years ? */
+ date = (((( time.tm_year * 12 + time.tm_mon ) * 30 + time.tm_mday ) * 24 + time.tm_hour ) * 60 + time.tm_min ) * 60 + time.tm_sec ;
+ schedule->i_period = ((mtime_t) date) * 1000000;
}
- else if( schedule != NULL )
+#endif /* UNDER_CE */
+ else if( !strcmp( psz_cmd, "repeat" ) )
{
int i;
- vlm_message_t *message;
- vlm_message_t *message_schedule;
- vlm_message_t *message_child;
- char buffer[100];
- message = vlm_MessageNew( "show" , NULL );
- message_schedule = vlm_MessageAdd( message , vlm_MessageNew( schedule->psz_name , NULL ) );
+ if( sscanf( psz_value, "%d", &i ) == 1 )
+ {
+ schedule->i_repeat = i;
+ }
+ else
+ {
+ return 1;
+ }
+ }
+ else if( !strcmp( psz_cmd, "append" ) )
+ {
+ char *command = strdup( psz_value );
+
+ TAB_APPEND( schedule->i_command, schedule->command, command );
+ }
+ else
+ {
+ return 1;
+ }
+ return 0;
+}
- vlm_MessageAdd( message_schedule , vlm_MessageNew( "type" , "schedule" ) );
+/*****************************************************************************
+ * Message handling functions
+ *****************************************************************************/
+static vlm_message_t *vlm_MessageNew( char *psz_name,
+ const char *psz_format, ... )
+{
+ vlm_message_t *p_message;
+ va_list args;
- if( schedule->b_enabled == VLC_TRUE )
+ if( !psz_name ) return 0;
+
+ p_message = malloc( sizeof(vlm_message_t) );
+ if( !p_message)
+ {
+ return NULL;
+ }
+
+ p_message->psz_value = 0;
+
+ if( psz_format )
+ {
+ va_start( args, psz_format );
+ if( vasprintf( &p_message->psz_value, psz_format, args ) < 0 )
{
- vlm_MessageAdd( message_schedule , vlm_MessageNew( "enabled" , "yes" ) );
+ va_end( args );
+ free( p_message );
+ return 0;
}
- else
+ va_end( args );
+ }
+
+ p_message->psz_name = strdup( psz_name );
+ p_message->i_child = 0;
+ p_message->child = NULL;
+
+ return p_message;
+}
+
+void vlm_MessageDelete( vlm_message_t *p_message )
+{
+ if( p_message->psz_name ) free( p_message->psz_name );
+ if( p_message->psz_value ) free( p_message->psz_value );
+ while( p_message->i_child-- )
+ vlm_MessageDelete( p_message->child[p_message->i_child] );
+ if( p_message->child ) free( p_message->child );
+ free( p_message );
+}
+
+/* Add a child */
+static vlm_message_t *vlm_MessageAdd( vlm_message_t *p_message,
+ vlm_message_t *p_child )
+{
+ if( p_message == NULL ) return NULL;
+
+ if( p_child )
+ {
+ TAB_APPEND( p_message->i_child, p_message->child, p_child );
+ }
+
+ return p_child;
+}
+
+/*****************************************************************************
+ * Misc utility functions
+ *****************************************************************************/
+static vlm_message_t *vlm_Show( vlm_t *vlm, vlm_media_t *media,
+ vlm_schedule_t *schedule, char *psz_filter )
+{
+ if( media != NULL )
+ {
+ int i;
+ vlm_message_t *msg;
+ vlm_message_t *msg_media;
+ vlm_message_t *msg_child;
+
+ msg = vlm_MessageNew( "show", NULL );
+ msg_media = vlm_MessageAdd( msg, vlm_MessageNew( media->psz_name, 0 ));
+
+ vlm_MessageAdd( msg_media,
+ vlm_MessageNew( "type", media->i_type == VOD_TYPE ?
+ "vod" : "broadcast" ) );
+ vlm_MessageAdd( msg_media,
+ vlm_MessageNew( "enabled", media->b_enabled ?
+ "yes" : "no" ) );
+
+ vlm_MessageAdd( msg_media,
+ vlm_MessageNew( "loop", media->b_loop ?
+ "yes" : "no" ) );
+
+ if( media->i_type == VOD_TYPE && media->psz_mux )
+ vlm_MessageAdd( msg_media,
+ vlm_MessageNew( "mux", media->psz_mux ) );
+
+ msg_child = vlm_MessageAdd( msg_media,
+ vlm_MessageNew( "inputs", NULL ) );
+
+ for( i = 0; i < media->i_input; i++ )
{
- vlm_MessageAdd( message_schedule , vlm_MessageNew( "enabled" , "no" ) );
+ vlm_MessageAdd( msg_child,
+ vlm_MessageNew( media->input[i], NULL ) );
}
+ vlm_MessageAdd( msg_media,
+ vlm_MessageNew( "output", media->psz_output ?
+ media->psz_output : "" ) );
+
+ msg_child = vlm_MessageAdd( msg_media, vlm_MessageNew( "options", 0 ));
+
+ for( i = 0; i < media->i_option; i++ )
+ {
+ vlm_MessageAdd( msg_child, vlm_MessageNew( media->option[i], 0 ) );
+ }
+
+ msg_child = vlm_MessageAdd( msg_media,
+ vlm_MessageNew( "instances", NULL ) );
+
+ for( i = 0; i < media->i_instance; i++ )
+ {
+ vlm_media_instance_t *p_instance = media->instance[i];
+ vlc_value_t val;
+ vlm_message_t *msg_instance;
+ char *psz_tmp;
+
+ if( !p_instance->p_input ) val.i_int = END_S;
+ else var_Get( p_instance->p_input, "state", &val );
+
+ msg_instance = vlm_MessageNew( "instance" , NULL );
+ vlm_MessageAdd( msg_instance, vlm_MessageNew( "name" , p_instance->psz_name ? p_instance->psz_name : "default" ) );
+ vlm_MessageAdd( msg_instance, vlm_MessageNew( "state",
+ val.i_int == PLAYING_S ? "playing" :
+ val.i_int == PAUSE_S ? "paused" :
+ "stopped" ) );
+#define APPEND_INPUT_INFO( a, format, type ) \
+ asprintf( &psz_tmp, format, \
+ var_Get ## type( p_instance->p_input, a ) ); \
+ vlm_MessageAdd( msg_instance, vlm_MessageNew( a, psz_tmp ) ); \
+ free( psz_tmp );
+ APPEND_INPUT_INFO( "position", "%f", Float );
+ APPEND_INPUT_INFO( "time", "%d", Integer );
+ APPEND_INPUT_INFO( "length", "%d", Integer );
+ APPEND_INPUT_INFO( "rate", "%d", Integer );
+ APPEND_INPUT_INFO( "title", "%d", Integer );
+ APPEND_INPUT_INFO( "chapter", "%d", Integer );
+ APPEND_INPUT_INFO( "seekable", "%d", Bool );
+#undef APPEND_INPUT_INFO
+ asprintf( &psz_tmp, "%d", p_instance->i_index + 1 );
+ vlm_MessageAdd( msg_instance, vlm_MessageNew( "playlistindex", psz_tmp ) );
+ free( psz_tmp );
+ vlm_MessageAdd( msg_child, msg_instance );
+ }
+
+ return msg;
+
+ }
+
+ else if( schedule != NULL )
+ {
+ int i;
+ vlm_message_t *msg;
+ vlm_message_t *msg_schedule;
+ vlm_message_t *msg_child;
+ char buffer[100];
+
+ msg = vlm_MessageNew( "show", NULL );
+ msg_schedule =
+ vlm_MessageAdd( msg, vlm_MessageNew( schedule->psz_name, 0 ) );
+
+ vlm_MessageAdd( msg_schedule, vlm_MessageNew("type", "schedule") );
+
+ vlm_MessageAdd( msg_schedule,
+ vlm_MessageNew( "enabled", schedule->b_enabled ?
+ "yes" : "no" ) );
+
+#if !defined( UNDER_CE )
if( schedule->i_date != 0 )
{
struct tm date;
- time_t i_time = (time_t) ( schedule->i_date / 1000000 );
- char *psz_date = malloc( strlen( "//-::" ) + 14 );
+ time_t i_time = (time_t)( schedule->i_date / 1000000 );
+ char *psz_date;
#ifdef HAVE_LOCALTIME_R
localtime_r( &i_time, &date);
date = *p_date;
#endif
- sprintf( psz_date, "%d/%d/%d-%d:%d:%d",
- date.tm_year + 1900, date.tm_mon + 1, date.tm_mday,
- date.tm_hour, date.tm_min, date.tm_sec );
+ asprintf( &psz_date, "%d/%d/%d-%d:%d:%d",
+ date.tm_year + 1900, date.tm_mon + 1, date.tm_mday,
+ date.tm_hour, date.tm_min, date.tm_sec );
-/*
- time_t i_time = schedule->i_date / (int64_t)1000000;
-
-#ifdef HAVE_CTIME_R
- char psz_date[500];
- ctime_r( &i_time, psz_date );
-#else
- char *psz_date = ctime( &i_time );
-#endif
-*/
- vlm_MessageAdd( message_schedule , vlm_MessageNew( "date" , psz_date ) );
+ vlm_MessageAdd( msg_schedule,
+ vlm_MessageNew( "date", psz_date ) );
free( psz_date );
}
else
{
- vlm_MessageAdd( message_schedule , vlm_MessageNew( "date" , "now" ) );
+ vlm_MessageAdd( msg_schedule, vlm_MessageNew("date", "now") );
}
if( schedule->i_period != 0 )
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( message_schedule , vlm_MessageNew( "period" , buffer ) );
+ vlm_MessageAdd( msg_schedule, vlm_MessageNew("period", buffer) );
}
else
{
- vlm_MessageAdd( message_schedule , vlm_MessageNew( "period" , "0" ) );
+ vlm_MessageAdd( msg_schedule, vlm_MessageNew("period", "0") );
}
+#endif /* UNDER_CE */
- sprintf( buffer, "%d" , schedule->i_repeat );
- vlm_MessageAdd( message_schedule , vlm_MessageNew( "repeat" , buffer ) );
+ sprintf( buffer, "%d", schedule->i_repeat );
+ vlm_MessageAdd( msg_schedule, vlm_MessageNew( "repeat", buffer ) );
- message_child = vlm_MessageAdd( message_schedule , vlm_MessageNew( "commands" , NULL ) );
+ msg_child =
+ vlm_MessageAdd( msg_schedule, vlm_MessageNew("commands", 0) );
- for( i=0 ; i < (schedule->i_command) ; i++ )
+ for( i = 0; i < schedule->i_command; i++ )
{
- vlm_MessageAdd( message_child , vlm_MessageNew( schedule->command[i] , NULL ) );
+ vlm_MessageAdd( msg_child,
+ vlm_MessageNew( schedule->command[i], NULL ) );
}
- return message;
+ return msg;
}
- else if( psz_filter && strcmp( psz_filter , "media") == 0 )
+
+ else if( psz_filter && !strcmp( psz_filter, "media" ) )
{
- int i;
- vlm_message_t *message;
- vlm_message_t *message_child;
+ int i, j;
+ vlm_message_t *msg;
+ vlm_message_t *msg_child;
+ int i_vod = 0, i_broadcast = 0;
+ char *psz_count;
- message = vlm_MessageNew( "show" , NULL );
- message_child = vlm_MessageAdd( message , vlm_MessageNew( "media" , NULL ) );
+ for( i = 0; i < vlm->i_media; i++ )
+ {
+ if( vlm->media[i]->i_type == VOD_TYPE )
+ i_vod ++;
+ else
+ i_broadcast ++;
+ }
+
+ asprintf( &psz_count, "( %d broadcast - %d vod )", i_broadcast, i_vod);
+
+ msg = vlm_MessageNew( "show", NULL );
+ msg_child = vlm_MessageAdd( msg, vlm_MessageNew( "media", psz_count ) );
+ free( psz_count );
for( i = 0; i < vlm->i_media; i++ )
{
vlm_media_t *m = vlm->media[i];
- vlm_message_t *message_media = vlm_MessageAdd( message_child , vlm_MessageNew( m->psz_name , NULL ) );
+ vlm_message_t *msg_media, *msg_instance;
- if( m->i_type == VOD_TYPE )
- {
- vlm_MessageAdd( message_media , vlm_MessageNew( "type" , "vod" ) );
- }
- else
- {
- vlm_MessageAdd( message_media , vlm_MessageNew( "type" , "broadcast" ) );
- }
+ msg_media = vlm_MessageAdd( msg_child,
+ vlm_MessageNew( m->psz_name, 0 ) );
- if( m->b_enabled == VLC_TRUE )
- {
- vlm_MessageAdd( message_media , vlm_MessageNew( "enabled" , "yes" ) );
- }
- else
- {
- vlm_MessageAdd( message_media , vlm_MessageNew( "enabled" , "no" ) );
- }
+ vlm_MessageAdd( msg_media,
+ vlm_MessageNew( "type", m->i_type == VOD_TYPE ?
+ "vod" : "broadcast" ) );
+
+ vlm_MessageAdd( msg_media,
+ vlm_MessageNew( "enabled", m->b_enabled ?
+ "yes" : "no" ) );
- if( m->p_input != NULL )
+ if( m->i_type == VOD_TYPE && m->psz_mux )
+ vlm_MessageAdd( msg_media,
+ vlm_MessageNew( "mux", m->psz_mux ) );
+
+ msg_instance = vlm_MessageAdd( msg_media,
+ vlm_MessageNew( "instances", 0 ) );
+
+ for( j = 0; j < m->i_instance; j++ )
{
+ vlm_media_instance_t *p_instance = m->instance[j];
vlc_value_t val;
- var_Get( m->p_input, "state", &val );
+ if( !p_instance->p_input ) val.i_int = END_S;
+ else var_Get( p_instance->p_input, "state", &val );
- if( val.i_int == PLAYING_S )
- {
- vlm_MessageAdd( message_media , vlm_MessageNew( "state" , "playing" ) );
- }
- else if( val.i_int == PAUSE_S )
- {
- vlm_MessageAdd( message_media , vlm_MessageNew( "state" , "paused" ) );
- }
- else
- {
- vlm_MessageAdd( message_media , vlm_MessageNew( "state" , "stop" ) );
- }
- }
- else
- {
- vlm_MessageAdd( message_media , vlm_MessageNew( "state" , "stop" ) );
+ vlm_MessageAdd( msg_instance,
+ vlm_MessageNew( p_instance->psz_name ?
+ p_instance->psz_name : "default",
+ val.i_int == PLAYING_S ? "playing" :
+ val.i_int == PAUSE_S ? "paused" :
+ "stopped" ) );
}
}
- return message;
+ return msg;
}
- else if( psz_filter && strcmp( psz_filter , "schedule") == 0 )
+
+ else if( psz_filter && !strcmp( psz_filter, "schedule" ) )
{
int i;
- vlm_message_t *message;
- vlm_message_t *message_child;
+ vlm_message_t *msg;
+ vlm_message_t *msg_child;
- message = vlm_MessageNew( "show" , NULL );
- message_child = vlm_MessageAdd( message , vlm_MessageNew( "schedule" , NULL ) );
+ msg = vlm_MessageNew( "show", NULL );
+ msg_child = vlm_MessageAdd( msg, vlm_MessageNew( "schedule", NULL ) );
for( i = 0; i < vlm->i_schedule; i++ )
{
vlm_schedule_t *s = vlm->schedule[i];
- vlm_message_t *message_schedule = vlm_MessageAdd( message_child , vlm_MessageNew( s->psz_name , NULL ) );
-
- if( s->b_enabled == VLC_TRUE )
- {
- mtime_t i_time;
- mtime_t i_next_date;
+ vlm_message_t *msg_schedule;
+ mtime_t i_time, i_next_date;
- vlm_MessageAdd( message_schedule , vlm_MessageNew( "enabled" , "yes" ) );
+ msg_schedule = vlm_MessageAdd( msg_child,
+ vlm_MessageNew( s->psz_name, 0 ) );
+ vlm_MessageAdd( msg_schedule,
+ vlm_MessageNew( "enabled", s->b_enabled ?
+ "yes" : "no" ) );
- /* calculate next date */
- i_time = mdate();
+ /* calculate next date */
+ i_time = vlm_Date();
+ i_next_date = s->i_date;
- i_next_date = s->i_date;
-
- if( s->i_period != 0 )
+ if( s->i_period != 0 )
+ {
+ int j = 0;
+ while( s->i_date + j * s->i_period <= i_time &&
+ s->i_repeat > j )
{
- int j = 0;
- while( s->i_date + j * s->i_period <= i_time && s->i_repeat > j )
- {
- j++;
- }
-
- i_next_date = s->i_date + j * s->i_period;
+ j++;
}
- if( i_next_date > i_time )
- {
- time_t i_date = (time_t) (i_next_date / 1000000) ;
+ i_next_date = s->i_date + j * s->i_period;
+ }
+
+ if( i_next_date > i_time )
+ {
+ time_t i_date = (time_t) (i_next_date / 1000000) ;
+#if !defined( UNDER_CE )
#ifdef HAVE_CTIME_R
- char psz_date[500];
- ctime_r( &i_date, psz_date );
+ char psz_date[500];
+ ctime_r( &i_date, psz_date );
#else
- char *psz_date = ctime( &i_date );
+ char *psz_date = ctime( &i_date );
#endif
- vlm_MessageAdd( message_schedule , vlm_MessageNew( "next launch" , psz_date ) );
- }
- }
- else
- {
- vlm_MessageAdd( message_schedule , vlm_MessageNew( "enabled" , "no" ) );
+ vlm_MessageAdd( msg_schedule,
+ vlm_MessageNew( "next launch", psz_date ) );
+#endif
}
}
- return message;
+ return msg;
}
- else if( psz_filter == NULL && media == NULL && schedule == NULL )
+
+ else if( ( psz_filter == NULL ) && ( media == NULL ) && ( schedule == NULL ) )
{
vlm_message_t *show1 = vlm_Show( vlm, NULL, NULL, "media" );
vlm_message_t *show2 = vlm_Show( vlm, NULL, NULL, "schedule" );
- vlm_MessageAdd( show1 , show2->child[0] );
+ vlm_MessageAdd( show1, show2->child[0] );
- /* we must destroy the parent node "show" of show2, and not the children */
+ /* We must destroy the parent node "show" of show2
+ * and not the children */
free( show2->psz_name );
free( show2 );
return show1;
}
+
else
{
- return vlm_MessageNew( "show" , NULL );
+ return vlm_MessageNew( "show", NULL );
}
}
static vlm_message_t *vlm_Help( vlm_t *vlm, char *psz_filter )
{
- vlm_message_t *message;
+ vlm_message_t *message, *message_child;
+
+#define MessageAdd( a ) \
+ vlm_MessageAdd( message, vlm_MessageNew( a, NULL ) );
+#define MessageAddChild( a ) \
+ vlm_MessageAdd( message_child, vlm_MessageNew( a, NULL ) );
if( psz_filter == NULL )
{
- char *help= strdup(
- "Commands Syntax:"
- "\n new (name) vod|broadcast|schedule [properties]"
- "\n setup (name) (properties)"
- "\n show [(name)|media|schedule]"
- "\n del (name)|all|media|schedule"
- "\n control (name) (command)"
- "\n save (config_file)"
- "\n load (config_file)"
- "\nMedia Proprieties Syntax:"
- "\n input (input_name)"
- "\n output (output_name)"
- "\n option (option_name)[=value]"
- "\n enabled|disabled"
- "\n loop|unloop (broadcast only)"
- "\nSchedule Proprieties Syntax:"
- "\n enabled|disabled"
- "\n append (command_until_rest_of_the_line)"
- "\n date (year)/(month)/(day)-(hour):(minutes):(seconds)|now"
- "\n period (years_aka_12_months)/(months_aka_30_days)/(days)-(hours):(minutes):(seconds)"
- "\n repeat (number_of_repetitions)"
- "\nControl Commands Syntax:"
- "\n play\n pause\n stop\n seek (percentage)\n" );
-
- message = vlm_MessageNew( "help" , NULL );
- vlm_MessageAdd( message , vlm_MessageNew( "Help" , help ) );
- free( help );
+ message = vlm_MessageNew( "help", NULL );
+
+ message_child = MessageAdd( "Commands Syntax:" );
+ MessageAddChild( "new (name) vod|broadcast|schedule [properties]" );
+ MessageAddChild( "setup (name) (properties)" );
+ MessageAddChild( "show [(name)|media|schedule]" );
+ MessageAddChild( "del (name)|all|media|schedule" );
+ MessageAddChild( "control (name) [instance_name] (command)" );
+ MessageAddChild( "save (config_file)" );
+ MessageAddChild( "export" );
+ MessageAddChild( "load (config_file)" );
+
+ message_child = MessageAdd( "Media Proprieties Syntax:" );
+ MessageAddChild( "input (input_name)" );
+ MessageAddChild( "inputdel (input_name)|all" );
+ MessageAddChild( "inputdeln input_number" );
+ MessageAddChild( "output (output_name)" );
+ MessageAddChild( "option (option_name)[=value]" );
+ MessageAddChild( "enabled|disabled" );
+ MessageAddChild( "loop|unloop (broadcast only)" );
+ MessageAddChild( "mux (mux_name)" );
+
+ message_child = MessageAdd( "Schedule Proprieties Syntax:" );
+ MessageAddChild( "enabled|disabled" );
+ MessageAddChild( "append (command_until_rest_of_the_line)" );
+ MessageAddChild( "date (year)/(month)/(day)-(hour):(minutes):"
+ "(seconds)|now" );
+ MessageAddChild( "period (years_aka_12_months)/(months_aka_30_days)/"
+ "(days)-(hours):(minutes):(seconds)" );
+ MessageAddChild( "repeat (number_of_repetitions)" );
+
+ message_child = MessageAdd( "Control Commands Syntax:" );
+ MessageAddChild( "play" );
+ MessageAddChild( "pause" );
+ MessageAddChild( "stop" );
+ MessageAddChild( "seek (percentage)" );
+
return message;
}
- return vlm_MessageNew( "help" , NULL );
+ return vlm_MessageNew( "help", NULL );
}
-/* file must end by '\0' */
-static int vlm_Load( vlm_t *vlm, char *file )
+/*****************************************************************************
+ * Config handling functions
+ *****************************************************************************/
+static int Load( vlm_t *vlm, char *file )
{
char *pf = file;
+ int i_line = 1;
while( *pf != '\0' )
{
vlm_message_t *message = NULL;
- int i_temp = 0;
- int i_next;
+ int i_end = 0;
- while( pf[i_temp] != '\n' && pf[i_temp] != '\0' && pf[i_temp] != '\r' )
+ while( pf[i_end] != '\n' && pf[i_end] != '\0' && pf[i_end] != '\r' )
{
- i_temp++;
+ i_end++;
}
- if( pf[i_temp] == '\r' || pf[i_temp] == '\n' )
- {
- pf[i_temp] = '\0';
- i_next = i_temp + 1;
- }
- else
+ if( pf[i_end] == '\r' || pf[i_end] == '\n' )
{
- i_next = i_temp;
+ pf[i_end] = '\0';
+ i_end++;
+ if( pf[i_end] == '\n' ) i_end++;
}
- if( ExecuteCommand( vlm, pf, &message ) )
+ if( *pf && ExecuteCommand( vlm, pf, &message ) )
{
- free( message );
+ if( message )
+ {
+ if( message->psz_value )
+ msg_Err( vlm, "Load error on line %d: %s: %s",
+ i_line, message->psz_name, message->psz_value );
+ vlm_MessageDelete( message );
+ }
return 1;
}
- free( message );
+ if( message ) vlm_MessageDelete( message );
- pf += i_next;
+ pf += i_end;
+ i_line++;
}
+
return 0;
}
-static char *vlm_Save( vlm_t *vlm )
+static char *Save( vlm_t *vlm )
{
char *save = NULL;
+ char psz_header[] = "\n"
+ "# VLC media player VLM command batch\n"
+ "# http://www.videolan.org/vlc/\n\n" ;
char *p;
int i,j;
- int i_length = 0;
+ int i_length = strlen( psz_header );
for( i = 0; i < vlm->i_media; i++ )
{
for( j = 0; j < media->i_input; j++ )
{
- i_length += strlen( "setup input \"\"\n" ) + strlen( media->psz_name ) + strlen( media->input[j] );
+ i_length += strlen( "setup input \"\"\n" ) +
+ strlen( media->psz_name ) + strlen( media->input[j] );
}
if( media->psz_output != NULL )
{
- i_length += strlen(media->psz_name) + strlen(media->psz_output) + strlen( "setup output \n" );
+ i_length += strlen(media->psz_name) + strlen(media->psz_output) +
+ strlen( "setup output \n" );
}
for( j=0 ; j < media->i_option ; j++ )
{
- i_length += strlen(media->psz_name) + strlen(media->option[j]) + strlen("setup option \n");
+ i_length += strlen(media->psz_name) + strlen(media->option[j]) +
+ strlen("setup option \n");
}
}
if( schedule->i_period != 0 )
{
- i_length += strlen( "setup " ) + strlen( schedule->psz_name ) + strlen( "period //-::\n" ) + 14;
+ i_length += strlen( "setup " ) + strlen( schedule->psz_name ) +
+ strlen( "period //-::\n" ) + 14;
}
if( schedule->i_repeat >= 0 )
char buffer[12];
sprintf( buffer, "%d", schedule->i_repeat );
- i_length += strlen( "setup repeat \n" ) + strlen( schedule->psz_name ) + strlen( buffer );
+ i_length += strlen( "setup repeat \n" ) +
+ strlen( schedule->psz_name ) + strlen( buffer );
}
else
{
for( j = 0; j < schedule->i_command; j++ )
{
- i_length += strlen( "setup append \n" ) + strlen( schedule->psz_name ) + strlen( schedule->command[j] );
+ i_length += strlen( "setup append \n" ) +
+ strlen( schedule->psz_name ) + strlen( schedule->command[j] );
}
}
p = save = malloc( i_length );
*save = '\0';
+ p += sprintf( p, "%s", psz_header );
+
/* finally we can write in it */
for( i = 0; i < vlm->i_media; i++ )
{
for( j = 0; j < media->i_input; j++ )
{
- p += sprintf( p, "setup %s input \"%s\"\n", media->psz_name, media->input[j] );
+ p += sprintf( p, "setup %s input \"%s\"\n", media->psz_name,
+ media->input[j] );
}
if( media->psz_output != NULL )
{
- p += sprintf( p, "setup %s output %s\n", media->psz_name, media->psz_output );
+ p += sprintf( p, "setup %s output %s\n", media->psz_name,
+ media->psz_output );
}
for( j = 0; j < media->i_option; j++ )
{
- p += sprintf( p, "setup %s option %s\n", media->psz_name, media->option[j] );
+ p += sprintf( p, "setup %s option %s\n", media->psz_name,
+ media->option[j] );
}
}
/* and now, the schedule scripts */
-
+#if !defined( UNDER_CE )
for( i = 0; i < vlm->i_schedule; i++ )
{
vlm_schedule_t *schedule = vlm->schedule[i];
date.tm_hour, date.tm_min, date.tm_sec);
}
-
if( schedule->i_period != 0 )
{
p += sprintf( p, "setup %s ", schedule->psz_name );
i_time = i_time / 12;
date.tm_year = (int)i_time;
- p += sprintf( p, "period %d/%d/%d-%d:%d:%d\n", date.tm_year ,
- date.tm_mon,
- date.tm_mday,
- date.tm_hour,
- date.tm_min,
- date.tm_sec);
+ p += sprintf( p, "period %d/%d/%d-%d:%d:%d\n",
+ date.tm_year, date.tm_mon, date.tm_mday,
+ date.tm_hour, date.tm_min, date.tm_sec);
}
if( schedule->i_repeat >= 0 )
{
- p += sprintf( p, "setup %s repeat %d\n", schedule->psz_name, schedule->i_repeat );
+ p += sprintf( p, "setup %s repeat %d\n",
+ schedule->psz_name, schedule->i_repeat );
}
else
{
for( j = 0; j < schedule->i_command; j++ )
{
- p += sprintf( p, "setup %s append %s\n", schedule->psz_name, schedule->command[j] );
+ p += sprintf( p, "setup %s append %s\n",
+ schedule->psz_name, schedule->command[j] );
}
}
+#endif /* UNDER_CE */
return save;
}
-static vlm_schedule_t *vlm_ScheduleNew( vlm_t *vlm , char *psz_name )
+/*****************************************************************************
+ * Manage:
+ *****************************************************************************/
+int vlm_MediaVodControl( void *p_private, vod_media_t *p_vod_media,
+ const char *psz_id, int i_query, va_list args )
{
- vlm_schedule_t *sched= malloc( sizeof( vlm_schedule_t ));
-
- sched->psz_name = strdup( psz_name );
- sched->b_enabled = VLC_FALSE;
- sched->i_command = 0;
- sched->command = NULL;
- sched->i_date = 0;
- sched->i_period = 0;
- sched->i_repeat = -1;
-
- TAB_APPEND( vlm->i_schedule , vlm->schedule , sched );
+ vlm_t *vlm = (vlm_t *)p_private;
+ int i, i_ret = VLC_EGENERIC;
- return sched;
-}
+ if( !p_private || !p_vod_media ) return VLC_EGENERIC;
-/* for now, simple delete. After, del with options (last arg) */
-static int vlm_ScheduleDelete( vlm_t *vlm, vlm_schedule_t *sched, char *psz_name )
-{
- int i;
+ vlc_mutex_lock( &vlm->lock );
- if( sched == NULL )
+ /* Find media */
+ for( i = 0; i < vlm->i_media; i++ )
{
- return 1;
+ if( p_vod_media == vlm->media[i]->vod_media ) break;
}
- TAB_REMOVE( vlm->i_schedule, vlm->schedule , sched );
-
- if( vlm->i_schedule == 0 && vlm->schedule ) free( vlm->schedule );
-
- free( sched->psz_name );
-
- for( i = 0; i < sched->i_command; i++ )
+ if( i == vlm->i_media )
{
- free( sched->command[i] );
+ vlc_mutex_unlock( &vlm->lock );
+ return VLC_EGENERIC;
}
- free( sched );
+ switch( i_query )
+ {
+ case VOD_MEDIA_PLAY:
+ vlm->media[i]->psz_vod_output = (char *)va_arg( args, char * );
+ i_ret = vlm_MediaControl( vlm, vlm->media[i], psz_id, "play", 0 );
+ vlm->media[i]->psz_vod_output = 0;
+ break;
- return 0;
-}
+ case VOD_MEDIA_PAUSE:
+ i_ret = vlm_MediaControl( vlm, vlm->media[i], psz_id, "pause", 0 );
+ break;
-static vlm_schedule_t *vlm_ScheduleSearch( vlm_t *vlm, char *psz_name )
-{
- int i;
+ case VOD_MEDIA_STOP:
+ i_ret = vlm_MediaControl( vlm, vlm->media[i], psz_id, "stop", 0 );
+ break;
- for( i = 0; i < vlm->i_schedule; i++ )
+ case VOD_MEDIA_SEEK:
{
- if( strcmp( psz_name, vlm->schedule[i]->psz_name ) == 0 )
- {
- return vlm->schedule[i];
- }
+ double f_pos = (double)va_arg( args, double );
+ char psz_pos[50];
+ lldiv_t div = lldiv( f_pos * 10000000, 10000000 );
+ sprintf( psz_pos, I64Fd".%07u", div.quot, (unsigned int) div.rem );
+ i_ret = vlm_MediaControl( vlm, vlm->media[i], psz_id, "seek", psz_pos);
+ break;
}
- return NULL;
-}
-
-/* Ok, setup schedule command will be able to support only one (argument value) at a time */
-static int vlm_ScheduleSetup( vlm_schedule_t *schedule, char *psz_cmd, char *psz_value )
-{
- if( strcmp( psz_cmd, "enabled" ) == 0 )
- {
- schedule->b_enabled = VLC_TRUE;
- }
- else if( strcmp( psz_cmd, "disabled" ) == 0 )
+ case VOD_MEDIA_REWIND:
{
- schedule->b_enabled = VLC_FALSE;
+ double f_scale = (double)va_arg( args, double );
+ char psz_scale[50];
+ lldiv_t div = lldiv( f_scale * 10000000, 10000000 );
+ sprintf( psz_scale, I64Fd".%07u", div.quot, (unsigned int) div.rem );
+ i_ret = vlm_MediaControl( vlm, vlm->media[i], psz_id, "rewind", psz_scale );
+ break;
}
- else if( strcmp( psz_cmd, "date" ) == 0 )
- {
- struct tm time;
- char *p;
- time_t date;
- time.tm_sec = 0; /* seconds */
- time.tm_min = 0; /* minutes */
- time.tm_hour = 0; /* hours */
- time.tm_mday = 0; /* day of the month */
- time.tm_mon = 0; /* month */
- time.tm_year = 0; /* year */
- time.tm_wday = 0; /* day of the week */
- time.tm_yday = 0; /* day in the year */
- time.tm_isdst = 0; /* daylight saving time */
-
- /* date should be year/month/day-hour:minutes:seconds */
- p = strchr( psz_value , '-' );
-
- if( strcmp( psz_value, "now" ) == 0 )
- {
- schedule->i_date = 0;
- }
- else if( p == NULL && sscanf( psz_value, "%d:%d:%d" , &time.tm_hour, &time.tm_min, &time.tm_sec ) != 3 ) /* it must be a hour:minutes:seconds */
- {
- return 1;
- }
- else
- {
- int i,j,k;
-
- switch( sscanf( p + 1, "%d:%d:%d" , &i, &j, &k ) )
- {
- case 1:
- time.tm_sec = i;
- break;
- case 2:
- time.tm_min = i;
- time.tm_sec = j;
- break;
- case 3:
- time.tm_hour = i;
- time.tm_min = j;
- time.tm_sec = k;
- break;
- default:
- return 1;
- }
-
- *p = '\0';
-
- switch( sscanf( psz_value, "%d/%d/%d" , &i, &j, &k ) )
- {
- case 1:
- time.tm_mday = i;
- break;
- case 2:
- time.tm_mon = i - 1;
- time.tm_mday = j;
- break;
- case 3:
- time.tm_year = i - 1900;
- time.tm_mon = j - 1;
- time.tm_mday = k;
- break;
- default:
- return 1;
- }
-
- date = mktime( &time );
- schedule->i_date = ((mtime_t) date) * 1000000;
- }
- }
- else if( strcmp( psz_cmd, "period" ) == 0 )
+ case VOD_MEDIA_FORWARD:
{
- struct tm time;
- char *p;
- char *psz_time = NULL, *psz_date = NULL;
- time_t date;
- int i,j,k;
-
- /* First, if date or period are modified, repeat should be equal to -1 */
- schedule->i_repeat = -1;
-
- time.tm_sec = 0; /* seconds */
- time.tm_min = 0; /* minutes */
- time.tm_hour = 0; /* hours */
- time.tm_mday = 0; /* day of the month */
- time.tm_mon = 0; /* month */
- time.tm_year = 0; /* year */
- time.tm_wday = 0; /* day of the week */
- time.tm_yday = 0; /* day in the year */
- time.tm_isdst = 0; /* daylight saving time */
-
- /* date should be year/month/day-hour:minutes:seconds */
- p = strchr( psz_value , '-' );
- if( p )
- {
- psz_date = psz_value;
- psz_time = p + 1;
-
- *p = '\0';
- }
- else
- {
- psz_time = psz_value;
- }
-
-
- switch( sscanf( psz_time, "%d:%d:%d" , &i, &j, &k ) )
- {
- case 1:
- time.tm_sec = i;
- break;
- case 2:
- time.tm_min = i;
- time.tm_sec = j;
- break;
- case 3:
- time.tm_hour = i;
- time.tm_min = j;
- time.tm_sec = k;
- break;
- default:
- return 1;
- }
- if( psz_date )
- {
- switch( sscanf( psz_date, "%d/%d/%d" , &i, &j, &k ) )
- {
- case 1:
- time.tm_mday = i;
- break;
- case 2:
- time.tm_mon = i;
- time.tm_mday = j;
- break;
- case 3:
- time.tm_year = i;
- time.tm_mon = j;
- time.tm_mday = k;
- break;
- default:
- return 1;
- }
- }
-
- /* ok, that's stupid... who is going to schedule streams every 42 years ? */
- date = (((( time.tm_year * 12 + time.tm_mon ) * 30 + time.tm_mday ) * 24 + time.tm_hour ) * 60 + time.tm_min ) * 60 + time.tm_sec ;
- schedule->i_period = ((mtime_t) date) * 1000000;
+ double f_scale = (double)va_arg( args, double );
+ char psz_scale[50];
+ lldiv_t div = lldiv( f_scale * 10000000, 10000000 );
+ sprintf( psz_scale, I64Fd".%07u", div.quot, (unsigned int) div.rem );
+ i_ret = vlm_MediaControl( vlm, vlm->media[i], psz_id, "forward", psz_scale );
+ break;
}
- else if( strcmp( psz_cmd, "repeat" ) == 0 )
- {
- int i;
- if( sscanf( psz_value, "%d" , &i ) == 1 )
- {
- schedule->i_repeat = i;
- }
- else
- {
- return 1;
- }
+ default:
+ break;
}
- else if( strcmp( psz_cmd, "append" ) == 0 )
- {
- char *command = strdup( psz_value );
- TAB_APPEND( schedule->i_command, schedule->command, command );
- }
- else
- {
- return 1;
- }
- return 0;
+ vlc_mutex_unlock( &vlm->lock );
+
+ return i_ret;
}
+
/*****************************************************************************
* Manage:
*****************************************************************************/
static int Manage( vlc_object_t* p_object )
{
vlm_t *vlm = (vlm_t*)p_object;
- int i,j;
+ int i, j;
mtime_t i_lastcheck;
mtime_t i_time;
- i_lastcheck = mdate();
+ i_lastcheck = vlm_Date();
msleep( 100000 );
while( !vlm->b_die )
{
+ char **ppsz_scheduled_commands = NULL;
+ int i_scheduled_commands = 0;
vlc_mutex_lock( &vlm->lock );
/* destroy the inputs that wants to die, and launch the next input */
for( i = 0; i < vlm->i_media; i++ )
{
- vlm_media_t *media = vlm->media[i];
+ vlm_media_t *p_media = vlm->media[i];
- if( media->p_input != NULL && ( media->p_input->b_eof || media->p_input->b_error ) )
+ for( j = 0; j < p_media->i_instance; j++ )
{
- input_StopThread( media->p_input );
+ vlm_media_instance_t *p_instance = p_media->instance[j];
- input_DestroyThread( media->p_input );
- vlc_object_detach( media->p_input );
- vlc_object_destroy( media->p_input );
- media->p_input = NULL;
- media->i_index++;
+ if( !p_instance->p_input ||
+ ( !p_instance->p_input->b_eof &&
+ !p_instance->p_input->b_error ) ) continue;
- if( media->i_index == media->i_input && media->b_loop == VLC_TRUE )
- {
- media->i_index = 0;
- }
+ input_StopThread( p_instance->p_input );
+ input_DestroyThread( p_instance->p_input );
+ vlc_object_detach( p_instance->p_input );
+ vlc_object_destroy( p_instance->p_input );
- if( media->i_index < media->i_input )
+ p_instance->i_index++;
+ if( p_instance->i_index == p_media->i_input &&
+ p_media->b_loop ) p_instance->i_index = 0;
+
+ if( p_instance->i_index < p_media->i_input )
{
+ /* FIXME, find a way to select the right instance */
char buffer[12];
-
- sprintf( buffer, "%d", media->i_index );
- vlm_MediaControl( vlm, media, "play", buffer );
+ sprintf( buffer, "%d", p_instance->i_index );
+ vlm_MediaControl( vlm, p_media, p_instance->psz_name,
+ "play", buffer );
+ }
+ else
+ {
+ if( vlm_MediaControl( vlm, p_media, p_instance->psz_name,
+ "stop", 0 ) == VLC_SUCCESS ) i--;
}
}
}
/* scheduling */
- i_time = mdate();
+ i_time = vlm_Date();
for( i = 0; i < vlm->i_schedule; i++ )
{
else if( vlm->schedule[i]->i_period != 0 )
{
int j = 0;
- while( vlm->schedule[i]->i_date + j * vlm->schedule[i]->i_period <= i_lastcheck &&
- ( vlm->schedule[i]->i_repeat > j || vlm->schedule[i]->i_repeat == -1 ) )
+ while( vlm->schedule[i]->i_date + j *
+ vlm->schedule[i]->i_period <= i_lastcheck &&
+ ( vlm->schedule[i]->i_repeat > j ||
+ vlm->schedule[i]->i_repeat == -1 ) )
{
j++;
}
- i_real_date = vlm->schedule[i]->i_date + j * vlm->schedule[i]->i_period;
+ i_real_date = vlm->schedule[i]->i_date + j *
+ vlm->schedule[i]->i_period;
}
if( i_real_date <= i_time && i_real_date > i_lastcheck )
{
- for( j = 0 ; j < vlm->schedule[i]->i_command ; j++ )
+ for( j = 0; j < vlm->schedule[i]->i_command; j++ )
{
- vlm_message_t *message = NULL;
-
- ExecuteCommand( vlm, vlm->schedule[i]->command[j] , &message );
-
- /* for now, drop the message */
- free( message );
+ TAB_APPEND( i_scheduled_commands,
+ ppsz_scheduled_commands,
+ strdup(vlm->schedule[i]->command[j] ) );
}
}
}
}
+ while( i_scheduled_commands )
+ {
+ vlm_message_t *message = NULL;
+ char *psz_command = ppsz_scheduled_commands[0];
+ ExecuteCommand( vlm, psz_command,&message );
+
+ /* for now, drop the message */
+ vlm_MessageDelete( message );
+ TAB_REMOVE( i_scheduled_commands,
+ ppsz_scheduled_commands,
+ psz_command );
+ free( psz_command );
+ }
i_lastcheck = i_time;
return VLC_SUCCESS;
}
+#else /* ENABLE_VLM */
-static vlm_message_t* vlm_MessageNew( char *psz_name , char *psz_value )
+/* We just define an empty wrapper */
+vlm_t *__vlm_New( vlc_object_t *a )
{
- vlm_message_t *message = malloc( sizeof(vlm_message_t) );
-
- if( psz_name )
- {
- message->psz_name = strdup( psz_name );
- }
- else
- {
- return NULL;
- }
-
- if( psz_value )
- {
- message->psz_value = strdup( psz_value );
- }
- else
- {
- message->psz_value = NULL;
- }
-
- message->i_child = 0;
- message->child = NULL;
-
- return message;
-}
-
-void vlm_MessageDelete( vlm_message_t* message )
-{
- int i;
-
- if( message->psz_name ) free( message->psz_name );
- if( message->psz_value ) free( message->psz_value );
-
- for( i = 0; i < message->i_child; i++)
- {
- vlm_MessageDelete( message->child[i] );
- }
-
- free( message );
-}
-
-/* add a child */
-static vlm_message_t* vlm_MessageAdd( vlm_message_t* message , vlm_message_t* child )
-{
- if( message == NULL ) return NULL;
-
- if( child )
- {
- TAB_APPEND( message->i_child , message->child , child );
- }
-
- return child;
+ msg_Err( a, "VideoLAN manager support is disabled" );
+ return 0;
}
+void vlm_Delete( vlm_t *a ){}
+int vlm_ExecuteCommand( vlm_t *a, char *b, vlm_message_t **c ){ return -1; }
+void vlm_MessageDelete( vlm_message_t *a ){}
+vlm_media_t *vlm_MediaNew( vlm_t *a, char *b, int c ){ return NULL; }
+vlm_media_t *vlm_MediaSearch (vlm_t *a, const char *b ) { return NULL; }
+void vlm_MediaDelete( vlm_t *a, vlm_media_t *b, char *c ){}
+int vlm_MediaSetup( vlm_t *a, vlm_media_t *b, char *c, char *d ){ return -1; }
+int vlm_MediaControl( vlm_t *a, vlm_media_t *b, char *c, char *d, char *e )
+ { return -1; }
+vlm_schedule_t * vlm_ScheduleNew( vlm_t *a, char *b ){ return NULL; }
+void vlm_ScheduleDelete( vlm_t *a, vlm_schedule_t *b, char *c ){}
+int vlm_ScheduleSetup( vlm_schedule_t *a, char *b, char *c ){ return -1; }
+int vlm_MediaVodControl( void *a, vod_media_t *b, char *c, int d, va_list e )
+ { return -1; }
+int vlm_Save( vlm_t *a, char *b ){ return -1; }
+int vlm_Load( vlm_t *a, char *b ){ return -1; }
+
+#endif /* ENABLE_VLM */
projects / vlc / blobdiff