/*****************************************************************************
* Preamble
*****************************************************************************/
+#include <vlc/vlc.h>
+
+#include <stdio.h>
#include <stdlib.h> /* malloc(), free() */
#include <ctype.h> /* tolower() */
-#include <vlc/vlc.h>
-
#ifdef ENABLE_VLM
#include <vlc/intf.h>
# include <sys/timeb.h> /* ftime() */
#endif
-#include "vlc_vlm.h"
-#include "vlc_vod.h"
-
-#define FREE( p ) \
- if( p ) { free( p ); (p) = NULL; }
+#include <vlc_vlm.h>
+#include <vlc_vod.h>
+#include <charset.h>
/*****************************************************************************
* Local prototypes.
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_MediaSearch ( vlm_t *, const char * );
static vlm_media_instance_t *vlm_MediaInstanceSearch( vlm_t *, vlm_media_t *, const char * );
static vlm_message_t *vlm_MessageNew( char *, const char *, ... );
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( !(p_vlm = vlc_object_find( p_this, VLC_OBJECT_VLM, FIND_ANYWHERE )) )
{
- msg_Info( p_this, "creating vlm" );
+ 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, &p_vlm->lock );
+ 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->schedule = NULL;
vlc_object_yield( p_vlm );
- vlc_object_attach( p_vlm, p_this->p_vlc );
+ vlc_object_attach( p_vlm, p_this->p_libvlc );
}
vlc_mutex_unlock( lockval.p_address );
vlm_message_t *p_message = NULL;
char *psz_buffer = NULL;
- msg_Dbg( p_this, "loading vlm conf ..." );
+ 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 vlm conf file" );
+ msg_Warn( p_this, "error while loading the configuration file" );
}
- free(p_message);
+ vlm_MessageDelete(p_message);
free(psz_buffer);
}
}
{
vlc_value_t lockval;
- var_Get( p_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( p_vlm );
vlc_mutex_destroy( &p_vlm->lock );
while( p_vlm->i_media ) vlm_MediaDelete( p_vlm, p_vlm->media[0], NULL );
- FREE( p_vlm->media );
+ FREENULL( p_vlm->media );
while( p_vlm->i_schedule ) vlm_ScheduleDelete( p_vlm,
p_vlm->schedule[0], NULL );
- FREE( p_vlm->schedule );
+ FREENULL( p_vlm->schedule );
vlc_object_detach( p_vlm );
vlc_object_destroy( p_vlm );
if( !p_vlm || !psz_file ) return 1;
- file = fopen( psz_file, "wt" );
+ file = utf8_fopen( psz_file, "wt" );
if( file == NULL ) return 1;
psz_save = Save( p_vlm );
*****************************************************************************/
int vlm_Load( vlm_t *p_vlm, const char *psz_file )
{
- FILE *file;
+ stream_t *p_stream;
int64_t i_size;
char *psz_buffer;
if( !p_vlm || !psz_file ) return 1;
- file = fopen( psz_file, "r" );
- if( file == NULL ) return 1;
+ p_stream = stream_UrlNew( p_vlm, psz_file );
+ if( p_stream == NULL ) return 1;
- if( fseek( file, 0, SEEK_END) != 0 )
+ if( stream_Seek( p_stream, 0 ) != 0 )
{
- fclose( file );
+ stream_Delete( p_stream );
return 2;
}
- i_size = ftell( file );
- fseek( file, 0, SEEK_SET );
+ i_size = stream_Size( p_stream );
+
psz_buffer = malloc( i_size + 1 );
if( !psz_buffer )
{
- fclose( file );
+ stream_Delete( p_stream );
return 2;
}
- fread( psz_buffer, 1, i_size, file );
+
+ stream_Read( p_stream, psz_buffer, i_size );
psz_buffer[ i_size ] = '\0';
+
+ stream_Delete( p_stream );
+
if( Load( p_vlm, psz_buffer ) )
{
- fclose( file );
free( psz_buffer );
return 3;
}
free( psz_buffer );
- fclose( file );
return 0;
}
*****************************************************************************/
static const char *FindEndCommand( const char *psz_sent )
{
+ 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;
else
{
const char *psz_temp;
+ const char *psz_buf;
+ char *psz_dst;
+ vlc_bool_t b_escape = VLC_FALSE;
int i_temp;
/* support for comments */
ppsz_command = realloc( ppsz_command, (i_command + 1) *
sizeof(char*) );
ppsz_command[ i_command ] = malloc( (i_temp + 1) * sizeof(char) );
- strncpy( ppsz_command[ i_command ], psz_cmd, i_temp );
- ppsz_command[ i_command ][ i_temp ] = '\0';
+
+ /* 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++;
p_message = vlm_MessageNew( "load", NULL );
goto success;
case 2:
- p_message = vlm_MessageNew( "load", "read file error" );
+ p_message = vlm_MessageNew( "load", "Read file error" );
goto error;
case 3:
p_message =
- vlm_MessageNew( "load", "error while loading file" );
+ vlm_MessageNew( "load", "Error while loading file" );
goto error;
default:
p_message =
}
else
{
- if( i + 1 >= i_command &&
+ if( ( (i + 1) >= i_command ) &&
!strcmp(ppsz_command[0], "new") )
{
vlm_MediaDelete( p_vlm, p_media, NULL );
"Wrong properties syntax" );
goto error;
}
- else if( i + 1 >= i_command )
+ else if( (i + 1) >= i_command )
{
p_message =
vlm_MessageNew( ppsz_command[0],
}
success:
- for( i = 0 ; i < i_command ; i++ ) FREE( ppsz_command[i] );
- FREE( ppsz_command );
+ for( i = 0 ; i < i_command ; i++ ) FREENULL( ppsz_command[i] );
+ FREENULL( ppsz_command );
*pp_message = p_message;
return VLC_SUCCESS;
p_message = vlm_MessageNew( ppsz_command[0], "Wrong command syntax" );
error:
- for( i = 0 ; i < i_command ; i++ ) FREE( ppsz_command[i] );
- FREE( ppsz_command );
+ 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, const char *psz_name )
+vlm_media_t *vlm_MediaSearch( vlm_t *vlm, const char *psz_name )
{
int i;
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 );
vlc_input_item_Init( VLC_OBJECT(vlm), &p_instance->item );
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",
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_value_t val;
float f_percentage;
- if( psz_args && sscanf( psz_args, "%f", &f_percentage ) == 1 )
+ if( psz_args )
{
- val.f_float = f_percentage / 100.0 ;
+ 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 )
+ {
+ 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;
}
{
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;
}
psz_time = psz_value;
}
-
switch( sscanf( psz_time, "%u:%u:%u", &i, &j, &k ) )
{
case 1:
{
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;
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" );
if( message->psz_value )
msg_Err( vlm, "Load error on line %d: %s: %s",
i_line, message->psz_name, message->psz_value );
- free( message );
+ vlm_MessageDelete( message );
}
return 1;
}
- if( message ) free( message );
+ if( message ) vlm_MessageDelete( message );
pf += i_end;
i_line++;
{
double f_pos = (double)va_arg( args, double );
char psz_pos[50];
-
- sprintf( psz_pos, "%f", f_pos );
+ 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:
*****************************************************************************/
ExecuteCommand( vlm, psz_command,&message );
/* for now, drop the message */
- free( message );
+ vlm_MessageDelete( message );
TAB_REMOVE( i_scheduled_commands,
ppsz_scheduled_commands,
psz_command );
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 )