X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_local.c;h=51f35f804a27f6c646c73e709fafa857eda8df66;hb=a0a988c50fce047427b445d5e21d7354862e8e23;hp=f1690817152f1100527c249ba98c34b7477ba796;hpb=2e5d3bd0e25e25230954affadc90da7f403f6c61;p=melted

diff --git a/src/miracle/miracle_local.c b/src/miracle/miracle_local.c
index f169081..51f35f8 100644
--- a/src/miracle/miracle_local.c
+++ b/src/miracle/miracle_local.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <signal.h>
 #include <execinfo.h>
-#include <stdio.h>
 
 /* Valerie header files */
 #include <valerie/valerie_util.h>
@@ -128,7 +127,8 @@ typedef enum
 	ATYPE_NONE,
 	ATYPE_FLOAT,
 	ATYPE_STRING,
-	ATYPE_INT
+	ATYPE_INT,
+	ATYPE_PAIR
 } 
 arguments_types;
 
@@ -166,7 +166,7 @@ static command_t vocabulary[] =
 	{"UADD", miracle_add_unit, 0, ATYPE_STRING, "Create a new DV unit (virtual VTR) to transmit to receiver specified in GUID argument."},
 	{"ULS", miracle_list_units, 0, ATYPE_NONE, "Lists the units that have already been added to the server."},
 	{"CLS", miracle_list_clips, 0, ATYPE_STRING, "Lists the clips at directory name argument."},
-	{"SET", miracle_set_global_property, 0, ATYPE_STRING, "Set a server configuration property."},
+	{"SET", miracle_set_global_property, 0, ATYPE_PAIR, "Set a server configuration property."},
 	{"GET", miracle_get_global_property, 0, ATYPE_STRING, "Get a server configuration property."},
 	{"RUN", miracle_run, 0, ATYPE_STRING, "Run a batch file." },
 	{"LIST", miracle_list, 1, ATYPE_NONE, "List the playlist associated to a unit."},
@@ -174,6 +174,7 @@ static command_t vocabulary[] =
 	{"INSERT", miracle_insert, 1, ATYPE_STRING, "Insert a clip at the given clip index."},
 	{"REMOVE", miracle_remove, 1, ATYPE_NONE, "Remove a clip at the given clip index."},
 	{"CLEAN", miracle_clean, 1, ATYPE_NONE, "Clean a unit by removing all but the currently playing clip."},
+	{"CLEAR", miracle_clear, 1, ATYPE_NONE, "Clear a unit by removing all clips."},
 	{"MOVE", miracle_move, 1, ATYPE_INT, "Move a clip to another clip index."},
 	{"APND", miracle_append, 1, ATYPE_STRING, "Append a clip specified in absolute filename argument."},
 	{"PLAY", miracle_play, 1, ATYPE_NONE, "Play a loaded clip at speed -2000 to 2000 where 1000 = normal forward speed."},
@@ -186,7 +187,7 @@ static command_t vocabulary[] =
 	{"SIN", miracle_set_in_point, 1, ATYPE_INT, "Set the IN point of the loaded clip to frame number argument. -1 = reset in point to 0"},
 	{"SOUT", miracle_set_out_point, 1, ATYPE_INT, "Set the OUT point of the loaded clip to frame number argument. -1 = reset out point to maximum."},
 	{"USTA", miracle_get_unit_status, 1, ATYPE_NONE, "Report information about the unit."},
-	{"USET", miracle_set_unit_property, 1, ATYPE_STRING, "Set a unit configuration property."},
+	{"USET", miracle_set_unit_property, 1, ATYPE_PAIR, "Set a unit configuration property."},
 	{"UGET", miracle_get_unit_property, 1, ATYPE_STRING, "Get a unit configuration property."},
 	{"XFER", miracle_transfer, 1, ATYPE_STRING, "Transfer the unit's clip to another unit specified as argument."},
 	{"SHUTDOWN", miracle_shutdown, 0, ATYPE_NONE, "Shutdown the server."},
@@ -303,7 +304,7 @@ static void sigsegv_handler()
 	miracle_log( LOG_CRIT, "Obtained %zd stack frames.\n", size );
 
 	for ( i = 0; i < size; i++ )
-		 miracle_log( LOG_CRIT, "%s\n", strings[ i ] );
+		 miracle_log( LOG_CRIT, "%s", strings[ i ] );
 
 	free( strings );
 
@@ -331,7 +332,8 @@ static valerie_response miracle_local_connect( miracle_local local )
 	signal( SIGPIPE, signal_handler );
 	signal( SIGALRM, signal_handler );
 	signal( SIGCHLD, SIG_IGN );
-	signal( SIGSEGV, sigsegv_handler );
+	if ( getenv( "MLT_SIGSEGV" ) )
+		signal( SIGSEGV, sigsegv_handler );
 
 	return response;
 }
@@ -359,7 +361,7 @@ int miracle_command_parse_unit( command_argument cmd, int argument )
 /** Parse a normal argument.
 */
 
-void *miracle_command_parse_argument( command_argument cmd, int argument, arguments_types type )
+void *miracle_command_parse_argument( command_argument cmd, int argument, arguments_types type, char *command )
 {
 	void *ret = NULL;
 	char *value = valerie_tokeniser_get_string( cmd->tokeniser, argument );
@@ -381,6 +383,19 @@ void *miracle_command_parse_argument( command_argument cmd, int argument, argume
 				ret = strdup( value );
 				break;
 					
+			case ATYPE_PAIR:
+				if ( strchr( command, '=' ) )
+				{
+					char *ptr = strchr( command, '=' );
+					while ( *( ptr - 1 ) != ' ' ) 
+						ptr --;
+					ret = strdup( ptr );
+					ptr = ret;
+					while( ptr[ strlen( ptr ) - 1 ] == ' ' )
+						ptr[ strlen( ptr ) - 1 ] = '\0';
+				}
+				break;
+
 			case ATYPE_INT:
 				ret = malloc( sizeof( int ) );
 				if ( ret != NULL )
@@ -453,7 +468,7 @@ static valerie_response miracle_local_execute( miracle_local local, char *comman
 
 			if ( miracle_command_get_error( &cmd ) == RESPONSE_SUCCESS )
 			{
-				cmd.argument = miracle_command_parse_argument( &cmd, position, vocabulary[ index ].type );
+				cmd.argument = miracle_command_parse_argument( &cmd, position, vocabulary[ index ].type, command );
 				if ( cmd.argument == NULL && vocabulary[ index ].type != ATYPE_NONE )
 					miracle_command_set_error( &cmd, RESPONSE_MISSING_ARG );
 				position ++;