X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_unit_commands.c;h=af242a44667ab9c0d8adb2da238220d1fef8ff79;hb=5c299d1ae6f3535df35b3f30bae0476a1ca50aa6;hp=99de3f40e027f99fde595727e46a63f6fb594c52;hpb=89963b31bc7e8fcad7c45103c313e802e186267d;p=melted

diff --git a/src/miracle/miracle_unit_commands.c b/src/miracle/miracle_unit_commands.c
index 99de3f4..af242a4 100644
--- a/src/miracle/miracle_unit_commands.c
+++ b/src/miracle/miracle_unit_commands.c
@@ -56,7 +56,7 @@ int miracle_load( 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 ) );
@@ -207,7 +207,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 ) );
@@ -249,7 +249,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;
 }
 
@@ -397,8 +397,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 )
@@ -406,13 +405,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;
 }