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

diff --git a/src/miracle/miracle_unit_commands.c b/src/miracle/miracle_unit_commands.c
index a630422..f38ff3a 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;
+		int64_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;
@@ -80,36 +80,29 @@ int miracle_list( command_argument cmd_arg )
 
 	return RESPONSE_INVALID_UNIT;
 }
-/*
+
 static int parse_clip( command_argument cmd_arg, int arg )
 {
-	dv_unit unit = miracle_get_unit(cmd_arg->unit);
-	int clip = dv_unit_get_current_clip( unit );
+	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
+	int clip = miracle_unit_get_current_clip( unit );
 	
-	if ( dv_tokeniser_count( cmd_arg->tokeniser ) > arg )
+	if ( valerie_tokeniser_count( cmd_arg->tokeniser ) > arg )
 	{
-		dv_player player = dv_unit_get_dv_player( unit );
-		char *token = dv_tokeniser_get_string( cmd_arg->tokeniser, arg );
+		char *token = valerie_tokeniser_get_string( cmd_arg->tokeniser, arg );
 		if ( token[ 0 ] == '+' )
 			clip += atoi( token + 1 );
 		else if ( token[ 0 ] == '-' )
 			clip -= atoi( token + 1 );
 		else
 			clip = atoi( token );
-		if ( clip < 0 )
-			clip = 0;
-		if ( clip >= player->size )
-			clip = player->size - 1;
 	}
 	
 	return clip;
 }
-*/
 
 int miracle_insert( command_argument cmd_arg )
 {
-	/*
-	dv_unit unit = miracle_get_unit(cmd_arg->unit);
+	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
 	char *filename = (char*) cmd_arg->argument;
 	char fullname[1024];
 
@@ -125,30 +118,26 @@ int miracle_insert( command_argument cmd_arg )
 		long in = -1, out = -1;
 		int index = parse_clip( cmd_arg, 3 );
 		
-		if ( dv_tokeniser_count( cmd_arg->tokeniser ) == 6 )
+		if ( valerie_tokeniser_count( cmd_arg->tokeniser ) == 6 )
 		{
-			in = atoi( dv_tokeniser_get_string( cmd_arg->tokeniser, 4 ) );
-			out = atoi( dv_tokeniser_get_string( cmd_arg->tokeniser, 5 ) );
+			in = atoi( valerie_tokeniser_get_string( cmd_arg->tokeniser, 4 ) );
+			out = atoi( valerie_tokeniser_get_string( cmd_arg->tokeniser, 5 ) );
 		}
 		
-		switch( dv_unit_insert( unit, fullname, index, in, out ) )
+		switch( miracle_unit_insert( unit, fullname, index, in, out ) )
 		{
-			case dv_pump_ok:
+			case valerie_ok:
 				return RESPONSE_SUCCESS;
-			case dv_pump_too_many_files_open:
-				return RESPONSE_TOO_MANY_FILES;
 			default:
 				return RESPONSE_BAD_FILE;
 		}
 	}
-	*/
 	return RESPONSE_SUCCESS;
 }
 
 int miracle_remove( command_argument cmd_arg )
 {
-	/*
-	dv_unit unit = miracle_get_unit(cmd_arg->unit);
+	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
 	
 	if (unit == NULL)
 		return RESPONSE_INVALID_UNIT;
@@ -156,42 +145,38 @@ int miracle_remove( command_argument cmd_arg )
 	{
 		int index = parse_clip( cmd_arg, 2 );
 			
-		if ( dv_unit_remove( unit, index ) != dv_pump_ok )
+		if ( miracle_unit_remove( unit, index ) != valerie_ok )
 			return RESPONSE_BAD_FILE;
 	}
-	*/
 	return RESPONSE_SUCCESS;
 }
 
 int miracle_clean( command_argument cmd_arg )
 {
-	/*
-	dv_unit unit = miracle_get_unit(cmd_arg->unit);
+	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
 	
 	if (unit == NULL)
 		return RESPONSE_INVALID_UNIT;
 	else
 	{
-		if ( dv_unit_clean( unit ) != dv_pump_ok )
+		if ( miracle_unit_clean( unit ) != valerie_ok )
 			return RESPONSE_BAD_FILE;
 	}
-	*/
 	return RESPONSE_SUCCESS;
 }
 
 int miracle_move( command_argument cmd_arg )
 {
-	/*
-	dv_unit unit = miracle_get_unit(cmd_arg->unit);
+	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
 	
 	if ( unit != NULL )
 	{
-		if ( dv_tokeniser_count( cmd_arg->tokeniser ) > 2 )
+		if ( valerie_tokeniser_count( cmd_arg->tokeniser ) > 2 )
 		{
 			int src = parse_clip( cmd_arg, 2 );
 			int dest = parse_clip( cmd_arg, 3 );
 			
-			if ( dv_unit_move( unit, src, dest ) != dv_pump_ok )
+			if ( miracle_unit_move( unit, src, dest ) != valerie_ok )
 				return RESPONSE_BAD_FILE;
 		}
 		else
@@ -203,7 +188,6 @@ int miracle_move( command_argument cmd_arg )
 	{
 		return RESPONSE_INVALID_UNIT;
 	}
-	*/
 
 	return RESPONSE_SUCCESS;
 }
@@ -223,11 +207,11 @@ int miracle_append( command_argument cmd_arg )
 		return RESPONSE_INVALID_UNIT;
 	else
 	{
-		double in = -1, out = -1;
+		int64_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 ) )
 		{
@@ -265,7 +249,10 @@ 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;
 }
 
@@ -291,31 +278,27 @@ int miracle_rewind( command_argument cmd_arg )
 
 int miracle_step( command_argument cmd_arg )
 {
-	/*
-	dv_unit unit = miracle_get_unit(cmd_arg->unit);
+	miracle_unit unit = miracle_get_unit(cmd_arg->unit);
 	
-	if (unit == NULL || dv_unit_is_offline(unit))
+	if (unit == NULL)
 		return RESPONSE_INVALID_UNIT;
 	else
 	{
-		dv_unit_play( unit, 0 );
-		dv_unit_step( unit, *(int*) cmd_arg->argument );
+		miracle_unit_play( unit, 0 );
+		miracle_unit_step( unit, *(int*) cmd_arg->argument );
 	}
-	*/
 	return RESPONSE_SUCCESS;
 }
 
 int miracle_goto( 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 || miracle_unit_is_offline(unit))
 		return RESPONSE_INVALID_UNIT;
 	else
-		dv_unit_change_position( unit, clip, *(int*) cmd_arg->argument );
-	*/
+		miracle_unit_change_position( unit, clip, *(int*) cmd_arg->argument );
 	return RESPONSE_SUCCESS;
 }
 
@@ -331,17 +314,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;
@@ -349,23 +331,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;
@@ -373,7 +353,7 @@ int miracle_set_out_point( command_argument cmd_arg )
 				return RESPONSE_OUT_OF_RANGE;
 		}
 	}
-	*/
+
 	return RESPONSE_SUCCESS;
 }
 
@@ -396,179 +376,24 @@ 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;
 }