/*****************************************************************************
* vlm.c: VLM interface plugin
*****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
+ * Copyright (C) 2000-2005 the VideoLAN team
* $Id$
*
* Authors: Simon Latapie <garf@videolan.org>
*
* 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.
*****************************************************************************/
/*****************************************************************************
#ifdef HAVE_TIME_H
# include <time.h> /* ctime() */
+# include <sys/timeb.h> /* ftime() */
#endif
-#include "vlc_vlm.h"
-#include "vlc_vod.h"
+#include <vlc_vlm.h>
+#include <vlc_vod.h>
+#include <charset.h>
+
+#define FREE( p ) \
+ if( p ) { free( p ); (p) = NULL; }
/*****************************************************************************
* 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 void vlm_MediaDelete ( vlm_t *, vlm_media_t *, char * );
-static vlm_media_t *vlm_MediaSearch ( vlm_t *, char * );
-static int vlm_MediaSetup ( vlm_t *, vlm_media_t *, char *, char * );
-static int vlm_MediaControl( vlm_t *, vlm_media_t *, char *, char *, char * );
-static vlm_media_instance_t *vlm_MediaInstanceSearch( vlm_t *, vlm_media_t *, char * );
+static vlm_media_instance_t *vlm_MediaInstanceSearch( vlm_t *, vlm_media_t *, const char * );
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 void 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_message_t *vlm_MessageAdd( vlm_message_t *, vlm_message_t * );
-static int vlm_MediaVodControl( void *, vod_media_t *, char *, int, va_list );
+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 );
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_vod = 0;
- vlm->i_schedule = 0;
- vlm->schedule = NULL;
+ vlc_mutex_init( p_this->p_vlc, &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_vlc );
}
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;
- var_Get( vlm->p_libvlc, "vlm_mutex", &lockval );
+ var_Get( p_vlm->p_libvlc, "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 );
- while( vlm->i_media ) vlm_MediaDelete( vlm, vlm->media[0], NULL );
- if( vlm->media ) free( vlm->media );
+ while( p_vlm->i_media ) vlm_MediaDelete( p_vlm, p_vlm->media[0], NULL );
+ FREE( p_vlm->media );
- while( vlm->i_schedule ) vlm_ScheduleDelete( vlm, vlm->schedule[0], NULL );
- if( vlm->schedule ) free( vlm->schedule );
+ while( p_vlm->i_schedule ) vlm_ScheduleDelete( p_vlm,
+ p_vlm->schedule[0], NULL );
+ FREE( p_vlm->schedule );
- vlc_object_detach( vlm );
- vlc_object_destroy( vlm );
+ vlc_object_detach( p_vlm );
+ vlc_object_destroy( p_vlm );
vlc_mutex_unlock( lockval.p_address );
}
/*****************************************************************************
* vlm_ExecuteCommand:
*****************************************************************************/
-int vlm_ExecuteCommand( vlm_t *vlm, char *command, vlm_message_t **message)
+int vlm_ExecuteCommand( vlm_t *p_vlm, const char *psz_command,
+ vlm_message_t **pp_message)
{
- int result;
+ int i_result;
- vlc_mutex_lock( &vlm->lock );
- result = ExecuteCommand( vlm, command, message );
- vlc_mutex_unlock( &vlm->lock );
+ vlc_mutex_lock( &p_vlm->lock );
+ i_result = ExecuteCommand( p_vlm, psz_command, pp_message );
+ vlc_mutex_unlock( &p_vlm->lock );
+
+ return i_result;
+}
+
+/*****************************************************************************
+ * vlm_Save:
+ *****************************************************************************/
+int vlm_Save( vlm_t *p_vlm, const char *psz_file )
+{
+ FILE *file;
+ char *psz_save;
+
+ 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 0;
+}
- return result;
+/*****************************************************************************
+ * vlm_Load:
+ *****************************************************************************/
+int vlm_Load( vlm_t *p_vlm, const char *psz_file )
+{
+ stream_t *p_stream;
+ int64_t i_size;
+ char *psz_buffer;
+
+ 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 )
+ {
+ stream_Delete( p_stream );
+ return 2;
+ }
+
+ i_size = stream_Size( p_stream );
+
+ psz_buffer = malloc( i_size + 1 );
+ if( !psz_buffer )
+ {
+ stream_Delete( p_stream );
+ return 2;
+ }
+
+ 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 char *FindEndCommand( char *psz )
+static const char *FindEndCommand( const char *psz_sent )
{
- char *psz_sent = psz;
+ vlc_bool_t b_escape = VLC_FALSE;
switch( *psz_sent )
{
case '\"':
psz_sent++;
-
- while( ( *psz_sent != '\"' ) && ( *psz_sent != '\0' ) )
+ while( ( *psz_sent != '\"' || b_escape == VLC_TRUE )
+ && ( *psz_sent != '\0' ) )
{
- if( *psz_sent == '\'' )
+ if( *psz_sent == '\'' && b_escape == VLC_FALSE )
{
psz_sent = FindEndCommand( psz_sent );
if( psz_sent == NULL ) return NULL;
}
- else psz_sent++;
+ else if( *psz_sent++ == '\\' && b_escape == VLC_FALSE )
+ b_escape = VLC_TRUE;
+ else
+ b_escape = VLC_FALSE;
}
if( *psz_sent == '\"' )
case '\'':
psz_sent++;
-
- while( ( *psz_sent != '\'' ) && ( *psz_sent != '\0' ) )
+ while( ( *psz_sent != '\'' || b_escape == VLC_TRUE )
+ && ( *psz_sent != '\0' ) )
{
- if( *psz_sent == '\"' )
+ if( *psz_sent == '\"' && b_escape == VLC_FALSE )
{
psz_sent = FindEndCommand( psz_sent );
if( psz_sent == NULL ) return NULL;
}
- else psz_sent++;
+ else if( *psz_sent++ == '\\' && b_escape == VLC_FALSE )
+ b_escape = VLC_TRUE;
+ else
+ b_escape = VLC_FALSE;
}
if( *psz_sent == '\'' )
default: /* now we can look for spaces */
while( ( *psz_sent != ' ' ) && ( *psz_sent != '\0' ) )
{
- if( ( *psz_sent == '\'' ) || ( *psz_sent == '\"' ) )
+ if( ( ( *psz_sent == '\'' ) || ( *psz_sent == '\"' ) )
+ && b_escape == VLC_FALSE )
{
psz_sent = FindEndCommand( psz_sent );
+ if( psz_sent == NULL ) return NULL;
}
- else psz_sent++;
+ else if( *psz_sent++ == '\\' && b_escape == VLC_FALSE )
+ b_escape = VLC_TRUE;
+ else
+ b_escape = VLC_FALSE;
+
}
return psz_sent;
*****************************************************************************
* Execute a command which ends with '\0' (string)
*****************************************************************************/
-static int ExecuteCommand(vlm_t *vlm, char *command, vlm_message_t **p_message)
+static int ExecuteCommand( vlm_t *p_vlm, const char *psz_command,
+ vlm_message_t **pp_message )
{
int i_command = 0;
- char **p_command = NULL;
- char *cmd = command;
- 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 == ' ' || *cmd == '\t' )
+ 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;
/* support for comments */
- if( i_command == 0 && *cmd == '#')
+ if( i_command == 0 && *psz_cmd == '#')
{
- message = vlm_MessageNew( "", NULL );
+ p_message = vlm_MessageNew( "", NULL );
goto success;
}
- p_temp = FindEndCommand( cmd );
+ psz_temp = FindEndCommand( psz_cmd );
- if( p_temp == NULL ) goto error;
+ if( psz_temp == NULL )
+ {
+ 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) );
- 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;
}
}
if( i_command == 0 )
{
- message = vlm_MessageNew( "", NULL );
+ p_message = vlm_MessageNew( "", NULL );
goto success;
}
- if( strcmp(p_command[0], "new") == 0 )
+ if( !strcmp(ppsz_command[0], "new") )
{
int i_type;
if( i_command < 3 ) goto syntax_error;
/* Get type */
- if( strcmp(p_command[2], "vod") == 0 )
+ if( !strcmp(ppsz_command[2], "vod") )
{
i_type = VOD_TYPE;
}
- else if( strcmp(p_command[2], "broadcast") == 0 )
+ else if( !strcmp(ppsz_command[2], "broadcast") )
{
i_type = BROADCAST_TYPE;
}
- else if( strcmp(p_command[2], "schedule") == 0 )
+ else if( !strcmp(ppsz_command[2], "schedule") )
{
i_type = SCHEDULE_TYPE;
}
else
{
- message = vlm_MessageNew( "new", "%s: Choose between vod, "
- "broadcast or schedule", p_command[1] );
+ p_message =
+ vlm_MessageNew( "new", "%s: Choose between vod, "
+ "broadcast or schedule", ppsz_command[1] );
goto error;
}
/* Check for forbidden media names */
- if( strcmp(p_command[1], "all") == 0 ||
- strcmp(p_command[1], "media") == 0 ||
- strcmp(p_command[1], "schedule") == 0 )
+ if( !strcmp(ppsz_command[1], "all") ||
+ !strcmp(ppsz_command[1], "media") ||
+ !strcmp(ppsz_command[1], "schedule") )
{
- message = vlm_MessageNew( "new", "\"all\", \"media\" and "
- "\"schedule\" are reserved names" );
+ p_message = vlm_MessageNew( "new", "\"all\", \"media\" and "
+ "\"schedule\" are reserved names" );
goto error;
}
/* Check the name is not already in use */
- if( vlm_ScheduleSearch( vlm, p_command[1] ) ||
- vlm_MediaSearch( vlm, p_command[1] ) )
+ if( vlm_ScheduleSearch( p_vlm, ppsz_command[1] ) ||
+ vlm_MediaSearch( p_vlm, ppsz_command[1] ) )
{
- message = vlm_MessageNew( "new", "%s: Name already in use",
- p_command[1] );
+ p_message = vlm_MessageNew( "new", "%s: Name already in use",
+ ppsz_command[1] );
goto error;
}
/* Schedule */
if( i_type == SCHEDULE_TYPE )
{
- vlm_schedule_t *schedule;
- schedule = vlm_ScheduleNew( vlm, p_command[1] );
- if( !schedule )
+ vlm_schedule_t *p_schedule;
+ p_schedule = vlm_ScheduleNew( p_vlm, ppsz_command[1] );
+ if( !p_schedule )
{
- message = vlm_MessageNew( "new", "could not create schedule" );
+ p_message = vlm_MessageNew( "new", "could not create schedule" );
goto error;
}
}
/* Media */
else
{
- vlm_media_t *media;
- media = vlm_MediaNew( vlm, p_command[1], i_type );
- if( !media )
+ vlm_media_t *p_media;
+ p_media = vlm_MediaNew( p_vlm, ppsz_command[1], i_type );
+ if( !p_media )
{
- message = vlm_MessageNew( "new", "could not create media" );
+ p_message = vlm_MessageNew( "new", "could not create media" );
goto error;
}
}
if( i_command <= 3 )
{
- message = vlm_MessageNew( "new", NULL );
+ p_message = vlm_MessageNew( "new", NULL );
goto success;
}
/* Properties will be dealt with later on */
}
- else if( strcmp(p_command[0], "setup") == 0 )
+ else if( !strcmp(ppsz_command[0], "setup") )
{
if( i_command < 2 ) goto syntax_error;
/* Properties will be dealt with later on */
}
-
- else if( strcmp(p_command[0], "del") == 0 )
+
+ else if( !strcmp(ppsz_command[0], "del") )
{
- vlm_media_t *media;
- vlm_schedule_t *schedule;
+ vlm_media_t *p_media;
+ vlm_schedule_t *p_schedule;
if( i_command < 2 ) goto syntax_error;
- media = vlm_MediaSearch( vlm, p_command[1] );
- schedule = vlm_ScheduleSearch( vlm, p_command[1] );
+ p_media = vlm_MediaSearch( p_vlm, ppsz_command[1] );
+ p_schedule = vlm_ScheduleSearch( p_vlm, ppsz_command[1] );
- if( schedule != NULL )
+ if( p_schedule != NULL )
{
- vlm_ScheduleDelete( vlm, schedule, NULL );
+ vlm_ScheduleDelete( p_vlm, p_schedule, NULL );
}
- else if( media != NULL )
+ else if( p_media != NULL )
{
- vlm_MediaDelete( vlm, media, NULL );
+ vlm_MediaDelete( p_vlm, p_media, NULL );
}
- else if( strcmp(p_command[1], "media") == 0 )
+ else if( !strcmp(ppsz_command[1], "media") )
{
- while( vlm->i_media ) vlm_MediaDelete( vlm, vlm->media[0], NULL );
+ while( p_vlm->i_media ) vlm_MediaDelete( p_vlm, p_vlm->media[0],
+ NULL );
}
- else if( strcmp(p_command[1], "schedule") == 0 )
+ else if( !strcmp(ppsz_command[1], "schedule") )
{
- while( vlm->i_schedule )
- vlm_ScheduleDelete( vlm, vlm->schedule[0], NULL );
+ while( p_vlm->i_schedule )
+ vlm_ScheduleDelete( p_vlm, p_vlm->schedule[0], NULL );
}
- else if( strcmp(p_command[1], "all") == 0 )
+ else if( !strcmp(ppsz_command[1], "all") )
{
- while( vlm->i_media ) vlm_MediaDelete( vlm, vlm->media[0], NULL );
+ while( p_vlm->i_media ) vlm_MediaDelete( p_vlm, p_vlm->media[0],
+ NULL );
- while( vlm->i_schedule )
- vlm_ScheduleDelete( vlm, vlm->schedule[0], NULL );
+ while( p_vlm->i_schedule )
+ vlm_ScheduleDelete( p_vlm, p_vlm->schedule[0], NULL );
}
else
{
- message = vlm_MessageNew( "del", "%s: media unknown",
- p_command[1] );
+ p_message = vlm_MessageNew( "del", "%s: media unknown",
+ ppsz_command[1] );
goto error;
}
- message = vlm_MessageNew( "del", NULL );
+ p_message = vlm_MessageNew( "del", NULL );
goto success;
}
- else if( strcmp(p_command[0], "show") == 0 )
+ else if( !strcmp(ppsz_command[0], "show") )
{
- vlm_media_t *media;
- vlm_schedule_t *schedule;
+ vlm_media_t *p_media;
+ vlm_schedule_t *p_schedule;
if( i_command == 1 )
{
- message = vlm_Show( vlm, NULL, NULL, NULL );
+ p_message = vlm_Show( p_vlm, NULL, NULL, NULL );
goto success;
}
else if( i_command > 2 ) goto syntax_error;
- media = vlm_MediaSearch( vlm, p_command[1] );
- schedule = vlm_ScheduleSearch( vlm, p_command[1] );
+ p_media = vlm_MediaSearch( p_vlm, ppsz_command[1] );
+ p_schedule = vlm_ScheduleSearch( p_vlm, ppsz_command[1] );
- if( schedule != NULL )
+ if( p_schedule != NULL )
{
- message = vlm_Show( vlm, NULL, schedule, NULL );
+ p_message = vlm_Show( p_vlm, NULL, p_schedule, NULL );
}
- else if( media != NULL )
+ else if( p_media != NULL )
{
- message = vlm_Show( vlm, media, NULL, NULL );
+ p_message = vlm_Show( p_vlm, p_media, NULL, NULL );
}
else
{
- message = vlm_Show( vlm, NULL, NULL, p_command[1] );
+ p_message = vlm_Show( p_vlm, NULL, NULL, ppsz_command[1] );
}
goto success;
}
- else if( strcmp(p_command[0], "help") == 0 )
+ else if( !strcmp(ppsz_command[0], "help") )
{
if( i_command != 1 ) goto syntax_error;
- message = vlm_Help( vlm, NULL );
+ p_message = vlm_Help( p_vlm, NULL );
goto success;
}
- else if( strcmp(p_command[0], "control") == 0 )
+ else if( !strcmp(ppsz_command[0], "control") )
{
- vlm_media_t *media;
+ vlm_media_t *p_media;
if( i_command < 3 ) goto syntax_error;
- if( !(media = vlm_MediaSearch( vlm, p_command[1] ) ) )
+ if( !(p_media = vlm_MediaSearch( p_vlm, ppsz_command[1] ) ) )
{
- message = vlm_MessageNew( "control", "%s: media unknown",
- p_command[1] );
+ p_message = vlm_MessageNew( "control", "%s: media unknown",
+ ppsz_command[1] );
goto error;
}
else
char *psz_command, *psz_arg = 0, *psz_instance = 0;
int i_index = 2;
- if( strcmp(p_command[2], "play") && strcmp(p_command[2], "stop") &&
- strcmp(p_command[2], "pause") && strcmp(p_command[2], "seek") )
+ if( strcmp( ppsz_command[2], "play" ) &&
+ strcmp( ppsz_command[2], "stop" ) &&
+ strcmp( ppsz_command[2], "pause" ) &&
+ strcmp( ppsz_command[2], "seek" ) )
{
i_index++;
- psz_instance = p_command[2];
+ psz_instance = ppsz_command[2];
if( i_command < 4 ) goto syntax_error;
}
- psz_command = p_command[i_index];
+ psz_command = ppsz_command[i_index];
- if( i_command >= i_index + 2 ) psz_arg = p_command[i_index + 1];
+ if( i_command >= i_index + 2 ) psz_arg = ppsz_command[i_index + 1];
- vlm_MediaControl( vlm, media, psz_instance, psz_command, psz_arg );
- message = vlm_MessageNew( "control", NULL );
+ 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], "save") == 0 )
+ else if( !strcmp(ppsz_command[0], "save") )
{
- FILE *file;
-
if( i_command != 2 ) goto syntax_error;
- file = fopen( p_command[1], "w" );
- if( file == NULL )
+ if( vlm_Save( p_vlm, ppsz_command[1] ) )
{
- message = vlm_MessageNew( "save", "Unable to save file" );
+ p_message = vlm_MessageNew( "save", "Unable to save to file" );
goto error;
}
else
{
- char *save = vlm_Save( vlm );
- fwrite( save, strlen( save ), 1, file );
- fclose( file );
- free( save );
- message = vlm_MessageNew( "save", NULL );
+ p_message = vlm_MessageNew( "save", NULL );
goto success;
}
}
- else if( strcmp(p_command[0], "load") == 0 )
+ else if( !strcmp(ppsz_command[0], "export" ) )
{
- FILE *file;
+ char *psz_buf;
- if( i_command != 2 ) goto syntax_error;
+ if( i_command != 1 ) goto syntax_error;
- file = fopen( p_command[1], "r" );
+ p_message = vlm_MessageNew( "export", psz_buf = Save( p_vlm ) );
+ free( psz_buf );
- if( file == NULL )
- {
- message = vlm_MessageNew( "load", "Unable to load file" );
- goto error;
- }
- else
- {
- int64_t size;
- char *buffer;
+ goto success;
+ }
- if( fseek( file, 0, SEEK_END) == 0 )
- {
- 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 ) )
- {
- free( buffer );
- message = vlm_MessageNew( "load", "error while loading "
- "file" );
- goto error;
- }
- free( buffer );
- }
- else
- {
- message = vlm_MessageNew( "load", "read file error" );
- goto error;
- }
+ else if( !strcmp(ppsz_command[0], "load") )
+ {
+ if( i_command != 2 ) goto syntax_error;
- fclose( file );
- message = vlm_MessageNew( "load", NULL );
- goto success;
+ switch( vlm_Load( p_vlm, ppsz_command[1] ) )
+ {
+ 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
{
- message = vlm_MessageNew( p_command[0], "Unknown command" );
+ p_message = vlm_MessageNew( ppsz_command[0], "Unknown command" );
goto error;
}
/* Common code between "new" and "setup" */
- if( strcmp(p_command[0], "new") == 0 ||
- strcmp(p_command[0], "setup") == 0 )
+ if( !strcmp(ppsz_command[0], "new") ||
+ !strcmp(ppsz_command[0], "setup") )
{
- int i_command_start = strcmp(p_command[0], "new") ? 2 : 3;
- vlm_media_t *media;
- vlm_schedule_t *schedule;
+ int i_command_start = strcmp(ppsz_command[0], "new") ? 2 : 3;
+ vlm_media_t *p_media;
+ vlm_schedule_t *p_schedule;
if( i_command < i_command_start ) goto syntax_error;
- media = vlm_MediaSearch( vlm, p_command[1] );
- schedule = vlm_ScheduleSearch( vlm, p_command[1] );
+ p_media = vlm_MediaSearch( p_vlm, ppsz_command[1] );
+ p_schedule = vlm_ScheduleSearch( p_vlm, ppsz_command[1] );
- if( !media && !schedule )
+ if( !p_media && !p_schedule )
{
- message = vlm_MessageNew( p_command[0], "%s unknown",
- p_command[1] );
+ p_message = vlm_MessageNew( ppsz_command[0], "%s unknown",
+ ppsz_command[1] );
goto error;
}
- if( schedule != NULL )
+ if( p_schedule != NULL )
{
for( i = i_command_start ; i < i_command ; i++ )
{
- if( strcmp( p_command[i], "enabled" ) == 0 ||
- strcmp( p_command[i], "disabled" ) == 0 )
+ if( !strcmp( ppsz_command[i], "enabled" ) ||
+ !strcmp( ppsz_command[i], "disabled" ) )
{
- vlm_ScheduleSetup( schedule, p_command[i], NULL );
+ vlm_ScheduleSetup( p_schedule, ppsz_command[i], NULL );
}
- /* Beware: everything behind append is considered as
+ /* Beware: everything behind append is considered as
* command line */
- else if( strcmp( p_command[i], "append" ) == 0 )
+ else if( !strcmp( ppsz_command[i], "append" ) )
{
if( ++i >= i_command ) break;
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] );
+ 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] );
}
- vlm_ScheduleSetup( schedule, p_command[i - 1],
- p_command[i] );
+ vlm_ScheduleSetup( p_schedule, ppsz_command[i - 1],
+ ppsz_command[i] );
break;
}
else
{
- if( i + 1 >= i_command && !strcmp(p_command[0], "new") )
+ if( i + 1 >= i_command && !strcmp(ppsz_command[0], "new") )
{
- vlm_ScheduleDelete( vlm, schedule, NULL );
- message = vlm_MessageNew( p_command[0],
- "Wrong properties syntax" );
+ 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 )
{
- message = vlm_MessageNew( p_command[0],
- "Wrong properties syntax" );
+ p_message =
+ vlm_MessageNew( ppsz_command[0],
+ "Wrong properties syntax" );
goto error;
}
- vlm_ScheduleSetup( schedule, p_command[i],
- p_command[i+1] );
+ vlm_ScheduleSetup( p_schedule, ppsz_command[i],
+ ppsz_command[i+1] );
i++;
}
}
}
- else if( media != NULL )
+ else if( p_media != NULL )
{
for( i = i_command_start ; i < i_command ; i++ )
{
- if( strcmp( p_command[i], "enabled" ) == 0 ||
- strcmp( p_command[i], "disabled" ) == 0 )
+ if( !strcmp( ppsz_command[i], "enabled" ) ||
+ !strcmp( ppsz_command[i], "disabled" ) )
{
- vlm_MediaSetup( vlm, media, p_command[i], NULL );
+ vlm_MediaSetup( p_vlm, p_media, ppsz_command[i], NULL );
}
- else if( i + 1 >= i_command && !strcmp( p_command[i], "mux" ) )
+ else if( i + 1 >= i_command &&
+ !strcmp( ppsz_command[i], "mux") )
{
- if( media->i_type != VOD_TYPE )
+ if( p_media->i_type != VOD_TYPE )
{
- message = vlm_MessageNew( p_command[0],
+ p_message = vlm_MessageNew( ppsz_command[0],
"mux only available for broadcast" );
}
else
{
- vlm_MediaSetup( vlm, media, p_command[i],
- p_command[i+1] );
+ vlm_MediaSetup( p_vlm, p_media, ppsz_command[i],
+ ppsz_command[i+1] );
i++;
}
}
- else if( strcmp( p_command[i], "loop" ) == 0 ||
- strcmp( p_command[i], "unloop" ) == 0 )
+ else if( !strcmp( ppsz_command[i], "loop" ) ||
+ !strcmp( ppsz_command[i], "unloop" ) )
{
- if( media->i_type != BROADCAST_TYPE )
+ if( p_media->i_type != BROADCAST_TYPE )
{
- message = vlm_MessageNew( p_command[0],
+ p_message = vlm_MessageNew( ppsz_command[0],
"loop only available for broadcast" );
}
else
{
- vlm_MediaSetup( vlm, media, p_command[i], NULL );
+ vlm_MediaSetup( p_vlm, p_media, ppsz_command[i], NULL );
}
}
else
{
- if( i + 1 >= i_command && !strcmp(p_command[0], "new") )
+ if( ( (i + 1) >= i_command ) &&
+ !strcmp(ppsz_command[0], "new") )
{
- vlm_MediaDelete( vlm, media, NULL );
- message = vlm_MessageNew( p_command[0],
- "Wrong properties syntax" );
+ 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 )
+ else if( (i + 1) >= i_command )
{
- message = vlm_MessageNew( p_command[0],
- "Wrong properties syntax" );
+ p_message =
+ vlm_MessageNew( ppsz_command[0],
+ "Wrong properties syntax" );
goto error;
}
- vlm_MediaSetup( vlm, media, p_command[i], p_command[i+1] );
+ vlm_MediaSetup( p_vlm, p_media, ppsz_command[i],
+ ppsz_command[i+1] );
i++;
}
}
}
- message = vlm_MessageNew( p_command[0], NULL );
+ p_message = vlm_MessageNew( ppsz_command[0], NULL );
goto success;
}
success:
- for( i = 0 ; i < i_command ; i++ ) free( p_command[i] );
- if( p_command ) free( p_command );
- *p_message = message;
+ for( i = 0 ; i < i_command ; i++ ) FREE( ppsz_command[i] );
+ FREE( ppsz_command );
+ *pp_message = p_message;
return VLC_SUCCESS;
syntax_error:
- message = vlm_MessageNew( p_command[0], "Wrong command syntax" );
+ p_message = vlm_MessageNew( ppsz_command[0], "Wrong command syntax" );
error:
- for( i = 0 ; i < i_command ; i++ ) free( p_command[i] );
- if( p_command ) free( p_command );
- *p_message = message;
+ for( i = 0 ; i < i_command ; i++ ) FREE( ppsz_command[i] );
+ FREE( 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;
* Media handling
*****************************************************************************/
static vlm_media_instance_t *
-vlm_MediaInstanceSearch( vlm_t *vlm, vlm_media_t *media, char *psz_name )
+vlm_MediaInstanceSearch( vlm_t *vlm, vlm_media_t *media,
+ const char *psz_name )
{
int 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 ) );
+ 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->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->i_instance = 0;
media->instance = NULL;
- media->item.psz_uri = strdup( psz_name );
vlc_input_item_Init( VLC_OBJECT(vlm), &media->item );
TAB_APPEND( vlm->i_media, vlm->media, media );
}
/* for now, simple delete. After, del with options (last arg) */
-static void 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 )
{
if( media == NULL ) return;
free( media );
}
-static int vlm_MediaSetup( vlm_t *vlm, 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, "mux" ) == 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" ) == 0 )
+ else if( !strcmp( psz_cmd, "input" ) )
{
char *input;
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
{
/* Pre-parse the input */
input_thread_t *p_input;
char *psz_output;
+ char *psz_header;
int i;
vlc_input_item_Clean( &media->item );
strdup( media->option[i] );
}
- if( (p_input = input_CreateThread( vlm, &media->item ) ) )
+ asprintf( &psz_header, _("Media: %s"), media->psz_name );
+
+ if( (p_input = input_CreateThread2( vlm, &media->item, psz_header
+ ) ) )
{
while( !p_input->b_eof && !p_input->b_error ) msleep( 100000 );
vlc_object_destroy( p_input );
}
free( psz_output );
+ free( psz_header );
if( media->psz_mux )
{
return VLC_SUCCESS;
}
-static int vlm_MediaControl( vlm_t *vlm, vlm_media_t *media, char *psz_id,
- char *psz_command, char *psz_args )
+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;
p_instance = vlm_MediaInstanceSearch( vlm, media, psz_id );
- if( strcmp( psz_command, "play" ) == 0 && !p_instance )
+ if( !strcmp( psz_command, "play" ) )
{
if( !media->b_enabled || media->i_input == 0 ) return 0;
if( !p_instance )
{
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 = 0;
+ p_instance->p_input = NULL;
- if( media->psz_output != NULL || media->psz_vod_output != NULL )
+ 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",
strdup( media->option[i] );
}
- p_instance->psz_name = psz_id ? strdup(psz_id) : 0;
+ p_instance->psz_name = psz_id ? strdup( psz_id ) : NULL;
TAB_APPEND( media->i_instance, media->instance, p_instance );
}
- if( psz_args && sscanf(psz_args, "%d", &i) == 1 && i < media->i_input )
+ if( ( psz_args && sscanf(psz_args, "%d", &i) == 1 ) && ( i < media->i_input ) )
{
p_instance->i_index = i;
}
vlc_object_destroy( p_instance->p_input );
}
- p_instance->p_input = input_CreateThread( vlm, &p_instance->item );
+ 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 )
{
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 );
return VLC_SUCCESS;
}
if( !p_instance ) return VLC_EGENERIC;
- if( strcmp( psz_command, "seek" ) == 0 )
+ if( !strcmp( psz_command, "seek" ) )
{
vlc_value_t val;
float f_percentage;
- if( psz_args && sscanf( psz_args, "%f", &f_percentage ) == 1 )
+ if( psz_args )
+ {
+ f_percentage = i18n_atof( psz_args );
+ if( f_percentage >= 0.0 && f_percentage <= 100.0 )
+ {
+ val.f_float = f_percentage / 100.0 ;
+ var_Set( p_instance->p_input, "position", val );
+ return VLC_SUCCESS;
+ }
+ }
+ }
+ else if( !strcmp( psz_command, "rewind" ) )
+ {
+ float f_pos;
+ float f_scale;
+ vlc_value_t val;
+
+ if( psz_args )
{
- val.f_float = f_percentage / 100.0 ;
+ 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, "stop" ) == 0 )
+ 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 );
return VLC_SUCCESS;
}
- else if( strcmp( psz_command, "pause" ) == 0 )
+ else if( !strcmp( psz_command, "pause" ) )
{
vlc_value_t val;
/*****************************************************************************
* Schedule handling
*****************************************************************************/
-static vlm_schedule_t *vlm_ScheduleNew( vlm_t *vlm, char *psz_name )
+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 *sched = malloc( sizeof( vlm_schedule_t ) );
+ vlm_schedule_t *p_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;
+ if( !p_sched )
+ {
+ return NULL;
+ }
+
+ if( !psz_name )
+ {
+ return NULL;
+ }
- TAB_APPEND( vlm->i_schedule, vlm->schedule, sched );
+ 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;
- return sched;
+ TAB_APPEND( vlm->i_schedule, vlm->schedule, p_sched );
+
+ return p_sched;
}
/* for now, simple delete. After, del with options (last arg) */
-static void vlm_ScheduleDelete( vlm_t *vlm, vlm_schedule_t *sched,
- char *psz_name )
+void vlm_ScheduleDelete( vlm_t *vlm, vlm_schedule_t *sched,
+ const char *psz_name )
{
if( sched == NULL ) return;
if( vlm->i_schedule == 0 && vlm->schedule ) free( vlm->schedule );
free( sched->psz_name );
- while( sched->i_command-- ) free( sched->command[sched->i_command] );
+ 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, char *psz_name )
+static vlm_schedule_t *vlm_ScheduleSearch( vlm_t *vlm, const char *psz_name )
{
int i;
}
/* 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 )
+int vlm_ScheduleSetup( vlm_schedule_t *schedule, const char *psz_cmd,
+ const char *psz_value )
{
- if( strcmp( psz_cmd, "enabled" ) == 0 )
+ if( !strcmp( psz_cmd, "enabled" ) )
{
schedule->b_enabled = VLC_TRUE;
}
- else if( strcmp( psz_cmd, "disabled" ) == 0 )
+ else if( !strcmp( psz_cmd, "disabled" ) )
{
schedule->b_enabled = VLC_FALSE;
}
#if !defined( UNDER_CE )
- else if( strcmp( psz_cmd, "date" ) == 0 )
+ else if( !strcmp( psz_cmd, "date" ) )
{
struct tm time;
- char *p;
+ const char *p;
time_t date;
time.tm_sec = 0; /* seconds */
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 */
+ 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" ) == 0 )
+ 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 */
+ 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;
+ unsigned i,j,k;
- switch( sscanf( p + 1, "%d:%d:%d", &i, &j, &k ) )
+ switch( sscanf( p + 1, "%u:%u:%u", &i, &j, &k ) )
{
case 1:
time.tm_sec = i;
return 1;
}
- *p = '\0';
-
switch( sscanf( psz_value, "%d/%d/%d", &i, &j, &k ) )
{
case 1:
schedule->i_date = ((mtime_t) date) * 1000000;
}
}
- else if( strcmp( psz_cmd, "period" ) == 0 )
+ else if( !strcmp( psz_cmd, "period" ) )
{
struct tm time;
- char *p;
- char *psz_time = NULL, *psz_date = NULL;
+ const char *p;
+ const char *psz_time = NULL, *psz_date = NULL;
time_t date;
- int i,j,k;
+ unsigned i,j,k;
/* First, if date or period are modified, repeat should be equal to -1 */
schedule->i_repeat = -1;
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 */
+ time.tm_isdst = -1; /* daylight saving time */
/* date should be year/month/day-hour:minutes:seconds */
p = strchr( psz_value, '-' );
{
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 ) )
+ switch( sscanf( psz_time, "%u:%u:%u", &i, &j, &k ) )
{
case 1:
time.tm_sec = i;
}
if( psz_date )
{
- switch( sscanf( psz_date, "%d/%d/%d", &i, &j, &k ) )
+ switch( sscanf( psz_date, "%u/%u/%u", &i, &j, &k ) )
{
case 1:
time.tm_mday = i;
schedule->i_period = ((mtime_t) date) * 1000000;
}
#endif /* UNDER_CE */
- else if( strcmp( psz_cmd, "repeat" ) == 0 )
+ else if( !strcmp( psz_cmd, "repeat" ) )
{
int i;
return 1;
}
}
- else if( strcmp( psz_cmd, "append" ) == 0 )
+ else if( !strcmp( psz_cmd, "append" ) )
{
char *command = strdup( psz_value );
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 )
{
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 );
- vlm_MessageAdd( msg_child,
- vlm_MessageNew( p_instance->psz_name ?
- p_instance->psz_name : "default",
+ 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( psz_filter && strcmp( psz_filter, "media" ) == 0 )
+ else if( psz_filter && !strcmp( psz_filter, "media" ) )
{
int i, j;
vlm_message_t *msg;
vlm_message_t *msg_child;
+ int i_vod = 0, i_broadcast = 0;
+ char *psz_count;
+
+ 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", NULL ) );
+ msg_child = vlm_MessageAdd( msg, vlm_MessageNew( "media", psz_count ) );
+ free( psz_count );
for( i = 0; i < vlm->i_media; i++ )
{
return msg;
}
- else if( psz_filter && strcmp( psz_filter, "schedule") == 0 )
+ else if( psz_filter && !strcmp( psz_filter, "schedule" ) )
{
int i;
vlm_message_t *msg;
vlm_MessageNew( "enabled", s->b_enabled ?
"yes" : "no" ) );
- if( !s->b_enabled ) return msg;
-
-
- vlm_MessageAdd( msg_schedule,
- vlm_MessageNew( "enabled", "yes" ) );
-
/* calculate next date */
- i_time = mdate();
+ i_time = vlm_Date();
i_next_date = s->i_date;
if( s->i_period != 0 )
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" );
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)" );
/*****************************************************************************
* Config handling functions
*****************************************************************************/
-static int vlm_Load( vlm_t *vlm, char *file )
+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' )
+ if( pf[i_end] == '\r' || pf[i_end] == '\n' )
{
- pf[i_temp] = '\0';
- i_next = i_temp + 1;
- }
- else
- {
- 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++ )
{
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++ )
{
/*****************************************************************************
* Manage:
*****************************************************************************/
-static int vlm_MediaVodControl( void *p_private, vod_media_t *p_vod_media,
- char *psz_id, int i_query, va_list args )
+int vlm_MediaVodControl( void *p_private, vod_media_t *p_vod_media,
+ const char *psz_id, int i_query, va_list args )
{
vlm_t *vlm = (vlm_t *)p_private;
int i, i_ret = VLC_EGENERIC;
i_ret = vlm_MediaControl( vlm, vlm->media[i], psz_id, "stop", 0 );
break;
+ case VOD_MEDIA_SEEK:
+ {
+ 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;
+ }
+
+ case VOD_MEDIA_REWIND:
+ {
+ 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;
+ }
+
+ case VOD_MEDIA_FORWARD:
+ {
+ 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;
+ }
+
default:
break;
}
return i_ret;
}
+
/*****************************************************************************
* Manage:
*****************************************************************************/
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 */
}
/* scheduling */
- i_time = mdate();
+ i_time = vlm_Date();
for( i = 0; i < vlm->i_schedule; i++ )
{
{
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;
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