Improved push capabilities

[melted] / src / valerie / valerie.c

diff --git a/src/valerie/valerie.c b/src/valerie/valerie.c
index 428ed0b..c76112d 100644 (file)
--- a/src/valerie/valerie.c
+++ b/src/valerie/valerie.c
@@ -145,6 +145,68 @@ valerie_error_code valerie_execute( valerie this, size_t size, char *format, ...
        return error;
 }
 
+/** Execute a command.
+*/
+
+valerie_error_code valerie_receive( valerie this, char *doc, size_t size, char *format, ... )
+{
+       valerie_error_code error = valerie_server_unavailable;
+       char *command = malloc( size );
+       if ( this != NULL && command != NULL )
+       {
+               va_list list;
+               va_start( list, format );
+               if ( vsnprintf( command, size, format, list ) != 0 )
+               {
+                       valerie_response response = valerie_parser_received( this->parser, command, doc );
+                       valerie_set_last_response( this, response );
+                       error = valerie_get_error_code( this, response );
+               }
+               else
+               {
+                       error = valerie_invalid_command;
+               }
+               va_end( list );
+       }
+       else
+       {
+               error = valerie_malloc_failed;
+       }
+       free( command );
+       return error;
+}
+
+/** Execute a command.
+*/
+
+valerie_error_code valerie_push( valerie this, mlt_service service, size_t size, char *format, ... )
+{
+       valerie_error_code error = valerie_server_unavailable;
+       char *command = malloc( size );
+       if ( this != NULL && command != NULL )
+       {
+               va_list list;
+               va_start( list, format );
+               if ( vsnprintf( command, size, format, list ) != 0 )
+               {
+                       valerie_response response = valerie_parser_push( this->parser, command, service );
+                       valerie_set_last_response( this, response );
+                       error = valerie_get_error_code( this, response );
+               }
+               else
+               {
+                       error = valerie_invalid_command;
+               }
+               va_end( list );
+       }
+       else
+       {
+               error = valerie_malloc_failed;
+       }
+       free( command );
+       return error;
+}
+
 /** Set a global property.
 */
 
@@ -184,7 +246,7 @@ valerie_error_code valerie_unit_add( valerie this, char *guid, int *unit )
        if ( error == valerie_ok )
        {
                int length = valerie_response_count( this->last_response );
-               char *line = valerie_response_get_line( this->last_response, length - 2 );
+               char *line = valerie_response_get_line( this->last_response, length - 1 );
                if ( line == NULL || sscanf( line, "U%d", unit ) != 1 )
                        error = valerie_unit_creation_failed;
        }
@@ -252,6 +314,22 @@ valerie_error_code valerie_unit_append( valerie this, int unit, char *file, int3
        return valerie_execute( this, 10240, "APND U%d \"%s\" %d %d", unit, file, in, out );
 }
 
+/** Push a service on to a unit.
+*/
+
+valerie_error_code valerie_unit_receive( valerie this, int unit, char *command, char *doc )
+{
+       return valerie_receive( this, doc, 10240, "PUSH U%d %s", unit, command );
+}
+
+/** Push a service on to a unit.
+*/
+
+valerie_error_code valerie_unit_push( valerie this, int unit, char *command, mlt_service service )
+{
+       return valerie_push( this, service, 10240, "PUSH U%d %s", unit, command );
+}
+
 /** Clean the unit - this function removes all but the currently playing clip.
 */
 
@@ -260,6 +338,14 @@ valerie_error_code valerie_unit_clean( valerie this, int unit )
        return valerie_execute( this, 1024, "CLEAN U%d", unit );
 }
 
+/** Clear the unit - this function removes all clips.
+*/
+
+valerie_error_code valerie_unit_clear( valerie this, int unit )
+{
+       return valerie_execute( this, 1024, "CLEAR U%d", unit );
+}
+
 /** Move clips on the units playlist.
 */
 
@@ -297,7 +383,7 @@ valerie_error_code valerie_unit_clip_insert( valerie this, int unit, valerie_cli
 {
        char temp[ 100 ];
        valerie_interpret_clip_offset( temp, offset, clip );
-       return valerie_execute( this, 1024, "INSERT U%d %s %s %d %d", unit, file, temp, in, out );
+       return valerie_execute( this, 1024, "INSERT U%d \"%s\" %s %d %d", unit, file, temp, in, out );
 }
 
 /** Play the unit at normal speed.