X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_unit_commands.c;h=f0cbfd11434d4f23d93989afdca28c5c7fc9d7e3;hb=4580365ba2f57f530aa4bdeb57788822fab09e2f;hp=f38ff3abcea9ac1914948985b77f92f69c704eae;hpb=c63b98c399b13d0672beb9cabba832a71d45a2ea;p=melted

diff --git a/src/miracle/miracle_unit_commands.c b/src/miracle/miracle_unit_commands.c
index f38ff3a..f0cbfd1 100644
--- a/src/miracle/miracle_unit_commands.c
+++ b/src/miracle/miracle_unit_commands.c
@@ -40,6 +40,7 @@ int miracle_load( command_argument cmd_arg )
 	char *filename = (char*) cmd_arg->argument;
 	char fullname[1024];
 	int flush = 1;
+	char *service;
 
 	if ( filename[0] == '!' )
 	{
@@ -47,16 +48,31 @@ int miracle_load( command_argument cmd_arg )
 		filename ++;
 	}
 
-	if ( filename[0] == '/' )
-		filename++;
+	service = strchr( filename, ':' );
+	if ( service != NULL )
+	{
+		service = filename;
+		filename = strchr( service, ':' );
+		*filename ++ = '\0';
+		
+		if ( strlen( cmd_arg->root_dir ) && filename[0] == '/' )
+			filename++;
+	
+		snprintf( fullname, 1023, "%s:%s%s", service, cmd_arg->root_dir, filename );
+	}
+	else
+	{
+		if ( strlen( cmd_arg->root_dir ) && filename[0] == '/' )
+			filename++;
 
-	snprintf( fullname, 1023, "%s%s", cmd_arg->root_dir, filename );
+		snprintf( fullname, 1023, "%s%s", cmd_arg->root_dir, filename );
+	}
 	
 	if (unit == NULL)
 		return RESPONSE_INVALID_UNIT;
 	else
 	{
-		int64_t in = -1, out = -1;
+		int32_t in = -1, out = -1;
 		if ( valerie_tokeniser_count( cmd_arg->tokeniser ) == 5 )
 		{
 			in = atol( valerie_tokeniser_get_string( cmd_arg->tokeniser, 3 ) );
@@ -106,7 +122,7 @@ int miracle_insert( command_argument cmd_arg )
 	char *filename = (char*) cmd_arg->argument;
 	char fullname[1024];
 
-	if ( filename[0] == '/' )
+	if ( strlen( cmd_arg->root_dir ) && filename[0] == '/' )
 		filename++;
 
 	snprintf( fullname, 1023, "%s%s", cmd_arg->root_dir, filename );
@@ -165,6 +181,20 @@ int miracle_clean( command_argument cmd_arg )
 	return RESPONSE_SUCCESS;
 }
 
+int miracle_clear( command_argument cmd_arg )
+{
+	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
+	
+	if (unit == NULL)
+		return RESPONSE_INVALID_UNIT;
+	else
+	{
+		if ( miracle_unit_clear( unit ) != valerie_ok )
+			return RESPONSE_BAD_FILE;
+	}
+	return RESPONSE_SUCCESS;
+}
+
 int miracle_move( command_argument cmd_arg )
 {
 	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
@@ -198,7 +228,7 @@ int miracle_append( command_argument cmd_arg )
 	char *filename = (char*) cmd_arg->argument;
 	char fullname[1024];
 
-	if ( filename[0] == '/' )
+	if ( strlen( cmd_arg->root_dir ) && filename[0] == '/' )
 		filename++;
 
 	snprintf( fullname, 1023, "%s%s", cmd_arg->root_dir, filename );
@@ -207,7 +237,7 @@ int miracle_append( command_argument cmd_arg )
 		return RESPONSE_INVALID_UNIT;
 	else
 	{
-		int64_t in = -1, out = -1;
+		int32_t in = -1, out = -1;
 		if ( valerie_tokeniser_count( cmd_arg->tokeniser ) == 5 )
 		{
 			in = atol( valerie_tokeniser_get_string( cmd_arg->tokeniser, 3 ) );
@@ -224,6 +254,31 @@ int miracle_append( command_argument cmd_arg )
 	return RESPONSE_SUCCESS;
 }
 
+int miracle_push( command_argument cmd_arg, mlt_service service )
+{
+	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
+	if ( unit != NULL && service != NULL )
+		if ( miracle_unit_append_service( unit, service ) == valerie_ok )
+			return RESPONSE_SUCCESS;
+	return RESPONSE_BAD_FILE;
+}
+
+int miracle_receive( command_argument cmd_arg, char *doc )
+{
+	mlt_producer producer = mlt_factory_producer( "westley-xml", doc );
+	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
+	if ( unit != NULL && producer != NULL )
+	{
+		if ( miracle_unit_append_service( unit, mlt_producer_service( producer ) ) == valerie_ok )
+		{
+			mlt_producer_close( producer );
+			return RESPONSE_SUCCESS;
+		}
+	}
+	mlt_producer_close( producer );
+	return RESPONSE_BAD_FILE;
+}
+
 int miracle_play( command_argument cmd_arg )
 {
 	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
@@ -249,10 +304,7 @@ int miracle_stop( command_argument cmd_arg )
 	if ( unit == NULL )
 		return RESPONSE_INVALID_UNIT;
 	else 
-	{
-		miracle_unit_play( unit, 0 );
 		miracle_unit_terminate( unit );
-	}
 	return RESPONSE_SUCCESS;
 }
 
@@ -400,8 +452,7 @@ int miracle_get_unit_property( command_argument cmd_arg )
 
 int miracle_transfer( command_argument cmd_arg )
 {
-	/*
-	dv_unit src_unit = miracle_get_unit(cmd_arg->unit);
+	miracle_unit src_unit = miracle_get_unit(cmd_arg->unit);
 	int dest_unit_id = -1;
 	char *string = (char*) cmd_arg->argument;
 	if ( string != NULL && ( string[ 0 ] == 'U' || string[ 0 ] == 'u' ) && strlen( string ) > 1 )
@@ -409,13 +460,12 @@ int miracle_transfer( command_argument cmd_arg )
 	
 	if ( src_unit != NULL && dest_unit_id != -1 )
 	{
-		dv_unit dest_unit = miracle_get_unit( dest_unit_id );
-		if ( dest_unit != NULL && !dv_unit_is_offline(dest_unit) && dest_unit != src_unit )
+		miracle_unit dest_unit = miracle_get_unit( dest_unit_id );
+		if ( dest_unit != NULL && !miracle_unit_is_offline(dest_unit) && dest_unit != src_unit )
 		{
-			dv_unit_transfer( dest_unit, src_unit );
+			miracle_unit_transfer( dest_unit, src_unit );
 			return RESPONSE_SUCCESS;
 		}
 	}
-	*/
 	return RESPONSE_INVALID_UNIT;
 }