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

diff --git a/src/miracle/miracle_unit_commands.c b/src/miracle/miracle_unit_commands.c
index c85aff0..af242a4 100644
--- a/src/miracle/miracle_unit_commands.c
+++ b/src/miracle/miracle_unit_commands.c
@@ -56,11 +56,11 @@ int miracle_load( command_argument cmd_arg )
 		return RESPONSE_INVALID_UNIT;
 	else
 	{
-		double in = -1, out = -1;
+		int32_t in = -1, out = -1;
 		if ( valerie_tokeniser_count( cmd_arg->tokeniser ) == 5 )
 		{
-			in = atof( valerie_tokeniser_get_string( cmd_arg->tokeniser, 3 ) );
-			out = atof( valerie_tokeniser_get_string( cmd_arg->tokeniser, 4 ) );
+			in = atol( valerie_tokeniser_get_string( cmd_arg->tokeniser, 3 ) );
+			out = atol( valerie_tokeniser_get_string( cmd_arg->tokeniser, 4 ) );
 		}
 		if ( miracle_unit_load( unit, fullname, in, out, flush ) != valerie_ok )
 			return RESPONSE_BAD_FILE;
@@ -207,11 +207,11 @@ int miracle_append( command_argument cmd_arg )
 		return RESPONSE_INVALID_UNIT;
 	else
 	{
-		double in = -1, out = -1;
+		int32_t in = -1, out = -1;
 		if ( valerie_tokeniser_count( cmd_arg->tokeniser ) == 5 )
 		{
-			in = atof( valerie_tokeniser_get_string( cmd_arg->tokeniser, 3 ) );
-			out = atof( valerie_tokeniser_get_string( cmd_arg->tokeniser, 4 ) );
+			in = atol( valerie_tokeniser_get_string( cmd_arg->tokeniser, 3 ) );
+			out = atol( valerie_tokeniser_get_string( cmd_arg->tokeniser, 4 ) );
 		}
 		switch ( miracle_unit_append( unit, fullname, in, out ) )
 		{
@@ -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;
 }
 
@@ -311,17 +311,16 @@ int miracle_ff( command_argument cmd_arg )
 
 int miracle_set_in_point( command_argument cmd_arg )
 {
-	/*
-	dv_unit unit = miracle_get_unit(cmd_arg->unit);
+	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
 	int clip = parse_clip( cmd_arg, 3 );
-	
-	if (unit == NULL || dv_unit_is_offline(unit))
+
+	if ( unit == NULL )
 		return RESPONSE_INVALID_UNIT;
 	else
 	{
 		int position = *(int *) cmd_arg->argument;
 
-		switch( dv_unit_set_clip_in( unit, clip, position ) )
+		switch( miracle_unit_set_clip_in( unit, clip, position ) )
 		{
 			case -1:
 				return RESPONSE_BAD_FILE;
@@ -329,23 +328,21 @@ int miracle_set_in_point( command_argument cmd_arg )
 				return RESPONSE_OUT_OF_RANGE;
 		}
 	}
-	*/
 	return RESPONSE_SUCCESS;
 }
 
 int miracle_set_out_point( command_argument cmd_arg )
 {
-	/*
-	dv_unit unit = miracle_get_unit(cmd_arg->unit);
+	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
 	int clip = parse_clip( cmd_arg, 3 );
 	
-	if (unit == NULL || dv_unit_is_offline(unit))
+	if ( unit == NULL )
 		return RESPONSE_INVALID_UNIT;
 	else
 	{
 		int position = *(int *) cmd_arg->argument;
 
-		switch( dv_unit_set_clip_out( unit, clip, position ) )
+		switch( miracle_unit_set_clip_out( unit, clip, position ) )
 		{
 			case -1:
 				return RESPONSE_BAD_FILE;
@@ -353,7 +350,7 @@ int miracle_set_out_point( command_argument cmd_arg )
 				return RESPONSE_OUT_OF_RANGE;
 		}
 	}
-	*/
+
 	return RESPONSE_SUCCESS;
 }
 
@@ -376,187 +373,31 @@ int miracle_get_unit_status( command_argument cmd_arg )
 
 int miracle_set_unit_property( command_argument cmd_arg )
 {
-	/*
-	dv_unit unit = miracle_get_unit(cmd_arg->unit);
-	
+	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
+	char *name_value = (char*) cmd_arg->argument;
 	if (unit == NULL)
 		return RESPONSE_INVALID_UNIT;
 	else
-	{
-		char *key = (char*) cmd_arg->argument;
-		char *value = NULL;
-
-		value = strchr( key, '=' );
-		if (value == NULL)
-			return RESPONSE_OUT_OF_RANGE;
-		value[0] = 0;
-		value++;
-		miracle_log( LOG_DEBUG, "USET %s = %s", key, value );
-		if ( strncasecmp( key, "eof", 1024) == 0 )
-		{
-			if ( strncasecmp( value, "pause", 1024) == 0)
-				dv_unit_set_eof_action( unit, dv_player_pause );
-			else if ( strncasecmp( value, "loop", 1024) == 0)
-				dv_unit_set_eof_action( unit, dv_player_loop );
-			else if ( strncasecmp( value, "stop", 1024) == 0)
-				dv_unit_set_eof_action( unit, dv_player_terminate );
-			else if ( strncasecmp( value, "clean", 1024) == 0)
-				dv_unit_set_eof_action( unit, dv_player_clean_loop );
-			else
-				return RESPONSE_OUT_OF_RANGE;
-		}
-		else if ( strncasecmp( key, "points", 1024) == 0 )
-		{
-			if ( strncasecmp( value, "use", 1024) == 0)
-				dv_unit_set_mode( unit, dv_clip_mode_restricted );
-			else if ( strncasecmp( value, "ignore", 1024) == 0)
-				dv_unit_set_mode( unit, dv_clip_mode_unrestricted );
-			else
-				return RESPONSE_OUT_OF_RANGE;
-		}
-		else if ( strncasecmp( key, "syt_offset", 1024) == 0 )
-		{
-			dv_unit_set_syt_offset( unit, atoi( value ) );
-		}
-		else if ( strncasecmp( key, "cip_n", 1024) == 0 )
-		{
-			dv_unit_set_cip_n( unit, atoi( value ) );
-		}
-		else if ( strncasecmp( key, "cip_d", 1024) == 0 )
-		{
-			dv_unit_set_cip_d( unit, atoi( value ) );
-		}
-		else if ( strncasecmp( key, "size", 1024) == 0 )
-		{
-			dv_unit_set_buffer_size( unit, atoi( value ) );
-		}
-		else if ( strncasecmp( key, "n_frames", 1024) == 0 )
-		{
-			dv_unit_set_n_frames( unit, atoi( value ) );
-		}		
-		else if ( strncasecmp( key, "n_fill", 1024) == 0 )
-		{
-			dv_unit_set_n_fill( unit, atoi( value ) );
-		}		
-		else
-			return RESPONSE_OUT_OF_RANGE;
-	}
-	*/
+		miracle_unit_set( unit, name_value );
 	return RESPONSE_SUCCESS;
 }
 
 int miracle_get_unit_property( command_argument cmd_arg )
 {
-	/*
-	dv_unit unit = miracle_get_unit(cmd_arg->unit);
-	
+	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
+	char *name = (char*) cmd_arg->argument;
+	char *value = miracle_unit_get( unit, name );
 	if (unit == NULL)
 		return RESPONSE_INVALID_UNIT;
-	else
-	{
-		char *key = (char*) cmd_arg->argument;
-
-		if ( strncasecmp( key, "eof", 1024) == 0 )
-		{
-			switch ( dv_unit_get_eof_action( unit ) )
-			{
-				case dv_player_pause:
-					dv_response_write( cmd_arg->response, "pause", strlen("pause") );
-					break;
-				case dv_player_loop:
-					dv_response_write( cmd_arg->response, "loop", strlen("loop") );
-					break;
-				case dv_player_terminate:
-					dv_response_write( cmd_arg->response, "stop", strlen("stop") );
-					break;
-				case dv_player_clean_loop:
-					dv_response_write( cmd_arg->response, "clean", strlen("clean") );
-					break;
-			}
-			return RESPONSE_SUCCESS_1;
-		}
-		else if ( strncasecmp( key, "points", 1024) == 0 )
-		{
-			if ( dv_unit_get_mode( unit ) == dv_clip_mode_restricted )
-				dv_response_write( cmd_arg->response, "use", strlen("use") );
-			else
-				dv_response_write( cmd_arg->response, "ignore", strlen("ignore") );
-			return RESPONSE_SUCCESS_1;
-		}
-		else if ( strncasecmp( key, "syt_offset", 1024) == 0 )
-		{
-			dv_response_printf( cmd_arg->response, 1024, "%d\n",
-				dv_unit_get_syt_offset( unit ) );
-			return RESPONSE_SUCCESS_1;
-		}
-		else if ( strncasecmp( key, "cip_n", 1024) == 0 )
-		{
-			dv_response_printf( cmd_arg->response, 1024, "%d\n",
-				dv_unit_get_cip_n( unit ) );
-			return RESPONSE_SUCCESS_1;
-		}
-		else if ( strncasecmp( key, "cip_d", 1024) == 0 )
-		{
-			dv_response_printf( cmd_arg->response, 1024, "%d\n",
-				dv_unit_get_cip_d( unit ) );
-			return RESPONSE_SUCCESS_1;
-		}
-		else if ( strncasecmp( key, "size", 1024) == 0 )
-		{
-			dv_response_printf( cmd_arg->response, 1024, "%d\n",
-				dv_unit_get_buffer_size( unit ) );
-			return RESPONSE_SUCCESS_1;
-		}
-		else if ( strncasecmp( key, "n_frames", 1024) == 0 )
-		{
-			dv_response_printf( cmd_arg->response, 1024, "%d\n",
-				dv_unit_get_n_frames( unit ) );
-			return RESPONSE_SUCCESS_1;
-		}
-		else if ( strncasecmp( key, "n_fill", 1024) == 0 )
-		{
-			dv_response_printf( cmd_arg->response, 1024, "%d\n",
-				dv_unit_get_n_fill( unit ) );
-			return RESPONSE_SUCCESS_1;
-		}
-		else if ( strncasecmp( key, "all", 1024 ) == 0 )
-		{
-			switch ( dv_unit_get_eof_action( unit ) )
-			{
-				case dv_player_pause:
-					dv_response_write( cmd_arg->response, "eof=pause\n", strlen("pause") );
-					break;
-				case dv_player_loop:
-					dv_response_write( cmd_arg->response, "eof=loop\n", strlen("loop") );
-					break;
-				case dv_player_terminate:
-					dv_response_write( cmd_arg->response, "eof=stop\n", strlen("stop") );
-					break;
-				case dv_player_clean_loop:
-					dv_response_write( cmd_arg->response, "eof=clean\n", strlen("clean") );
-					break;
-			}
-			if ( dv_unit_get_mode( unit ) == dv_clip_mode_restricted )
-				dv_response_write( cmd_arg->response, "points=use\n", strlen("use") );
-			else
-				dv_response_write( cmd_arg->response, "points=ignore\n", strlen("ignore") );
-			dv_response_printf( cmd_arg->response, 1024, "syt_offset=%d\n", dv_unit_get_syt_offset( unit ) );
-			dv_response_printf( cmd_arg->response, 1024, "cip_n=%d\n", dv_unit_get_cip_n( unit ) );
-			dv_response_printf( cmd_arg->response, 1024, "cip_d=%d\n", dv_unit_get_cip_d( unit ) );
-			dv_response_printf( cmd_arg->response, 1024, "size=%d\n", dv_unit_get_buffer_size( unit ) );
-			dv_response_printf( cmd_arg->response, 1024, "n_frames=%d\n", dv_unit_get_n_frames( unit ) );
-			dv_response_printf( cmd_arg->response, 1024, "n_fill=%d\n", dv_unit_get_n_fill( unit ) );
-		}
-	}
-	*/
+	else if ( value != NULL )
+		valerie_response_printf( cmd_arg->response, 1024, "%s\n", value );
 	return RESPONSE_SUCCESS;
 }
 
 
 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 )
@@ -564,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;
 }