From 44dfb69d78c05f24c350fa8e54a800676316a437 Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Fri, 15 May 2009 22:16:28 -0700 Subject: [PATCH] Make melted operational. Also remove remaining vestages of fezzik, westley, and valerie. Signed-off-by: Dan Dennedy --- src/melted/melted_connection.c | 2 +- src/melted/melted_unit.c | 2 +- src/melted/melted_unit_commands.c | 2 +- src/modules/mvcp/consumer_mvcp.c | 2 +- src/mvcp-client/io.h | 4 ++-- src/mvcp/mvcp_remote.c | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/melted/melted_connection.c b/src/melted/melted_connection.c index 1fdc110..af70046 100644 --- a/src/melted/melted_connection.c +++ b/src/melted/melted_connection.c @@ -252,7 +252,7 @@ void *parser_thread( void *arg ) { if ( mlt_properties_get( owner, "push-parser-off" ) == 0 ) { - service = ( mlt_service )mlt_factory_producer( NULL, "westley-xml", buffer ); + service = ( mlt_service )mlt_factory_producer( NULL, "xml-string", buffer ); mlt_events_fire( owner, "push-received", &response, command, service, NULL ); if ( response == NULL ) response = mvcp_parser_push( parser, command, service ); diff --git a/src/melted/melted_unit.c b/src/melted/melted_unit.c index 8a86764..9f68cc6 100644 --- a/src/melted/melted_unit.c +++ b/src/melted/melted_unit.c @@ -154,7 +154,7 @@ static mlt_producer locate_producer( melted_unit unit, char *file ) { profile = mlt_service_profile( MLT_CONSUMER_SERVICE( consumer ) ); } - return mlt_factory_producer( profile, "fezzik", file ); + return mlt_factory_producer( profile, NULL, file ); } /** Update the generation count. diff --git a/src/melted/melted_unit_commands.c b/src/melted/melted_unit_commands.c index ca94e78..43d82af 100644 --- a/src/melted/melted_unit_commands.c +++ b/src/melted/melted_unit_commands.c @@ -285,7 +285,7 @@ int melted_receive( command_argument cmd_arg, char *doc ) // Get the consumer's profile mlt_consumer consumer = mlt_properties_get_data( unit->properties, "consumer", NULL ); mlt_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( consumer ) ); - mlt_producer producer = mlt_factory_producer( profile, "westley-xml", doc ); + mlt_producer producer = mlt_factory_producer( profile, "xml-string", doc ); if ( producer != NULL ) { if ( melted_unit_append_service( unit, MLT_PRODUCER_SERVICE( producer ) ) == mvcp_ok ) diff --git a/src/modules/mvcp/consumer_mvcp.c b/src/modules/mvcp/consumer_mvcp.c index 3ee42db..fe7a844 100644 --- a/src/modules/mvcp/consumer_mvcp.c +++ b/src/modules/mvcp/consumer_mvcp.c @@ -94,7 +94,7 @@ static int consumer_start( mlt_consumer this ) mvcp connection = mlt_properties_get_data( properties, "connection", NULL ); // Special case - we can get a doc too... - char *doc = mlt_properties_get( properties, "westley" ); + char *doc = mlt_properties_get( properties, "xml" ); // Set the title if provided if ( service != NULL ) diff --git a/src/mvcp-client/io.h b/src/mvcp-client/io.h index 321ff2f..7540c79 100644 --- a/src/mvcp-client/io.h +++ b/src/mvcp-client/io.h @@ -1,6 +1,6 @@ /* - * io.h -- Valerie client demo input/output - * Copyright (C) 2002-2003 Ushodaya Enterprises Limited + * io.h -- MVCP client input/output + * Copyright (C) 2002-2000 Ushodaya Enterprises Limited * Author: Charles Yates * * This program is free software; you can redistribute it and/or modify diff --git a/src/mvcp/mvcp_remote.c b/src/mvcp/mvcp_remote.c index d8d124d..6ea0430 100644 --- a/src/mvcp/mvcp_remote.c +++ b/src/mvcp/mvcp_remote.c @@ -196,7 +196,7 @@ static mvcp_response mvcp_remote_execute( mvcp_remote remote, char *command ) return response; } -/** Push a westley document to the server. +/** Push a MLT XML document to the server. */ static mvcp_response mvcp_remote_receive( mvcp_remote remote, char *command, char *buffer ) @@ -228,7 +228,7 @@ static mvcp_response mvcp_remote_push( mvcp_remote remote, char *command, mlt_se mvcp_response response = NULL; if ( service != NULL ) { - mlt_consumer consumer = mlt_factory_consumer( NULL, "westley", "buffer" ); + mlt_consumer consumer = mlt_factory_consumer( NULL, "xml", "buffer" ); mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer ); char *buffer = NULL; // Temporary hack -- 1.7.4.4