X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmelted%2B%2B%2FMltMelted.cpp;fp=src%2Fmelted%2B%2B%2FMltMelted.cpp;h=5dbaa31054f764c401663f69f99919d2311190b5;hb=24824fc07fba808c9a1064ac448decfc63174d64;hp=1e6d7ea57d798501404da972b494eb6c250c0f5d;hpb=0d34ccaa99c167ac97c8b31be861ad3761c3569e;p=melted

diff --git a/src/melted++/MltMelted.cpp b/src/melted++/MltMelted.cpp
index 1e6d7ea..5dbaa31 100644
--- a/src/melted++/MltMelted.cpp
+++ b/src/melted++/MltMelted.cpp
@@ -1,6 +1,6 @@
 /**
- * MltMiracle.cpp - MLT Wrapper
- * Copyright (C) 2004-2005 Charles Yates
+ * MltMelted.cpp - MLT Melted Wrapper
+ * Copyright (C) 2004-2009 Charles Yates
  * Author: Charles Yates <charles.yates@pandora.be>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,40 +18,40 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "MltMiracle.h"
+#include "MltMelted.h"
 #include "MltService.h"
 #include "MltResponse.h"
 using namespace Mlt;
 
 #include <time.h>
 
-static valerie_response mlt_miracle_execute( void *arg, char *command )
+static mvcp_response mlt_melted_execute( void *arg, char *command )
 {
-	Miracle *miracle = ( Miracle * )arg;
-	if ( miracle != NULL )
+	Melted *melted = ( Melted * )arg;
+	if ( melted != NULL )
 	{
-		Response *response = miracle->execute( command );
-		valerie_response real = valerie_response_clone( response->get_response( ) );
+		Response *response = melted->execute( command );
+		mvcp_response real = mvcp_response_clone( response->get_response( ) );
 		delete response;
 		return real;
 	}
 	else
 	{
-		valerie_response response = valerie_response_init( );
-		valerie_response_set_error( response, 500, "Invalid server" );
+		mvcp_response response = mvcp_response_init( );
+		mvcp_response_set_error( response, 500, "Invalid server" );
 		return response;
 	}
 }
 
-static valerie_response mlt_miracle_received( void *arg, char *command, char *doc )
+static mvcp_response mlt_melted_received( void *arg, char *command, char *doc )
 {
-	Miracle *miracle = ( Miracle * )arg;
-	if ( miracle != NULL )
+	Melted *melted = ( Melted * )arg;
+	if ( melted != NULL )
 	{
-		Response *response = miracle->received( command, doc );
+		Response *response = melted->received( command, doc );
 		if ( response != NULL )
 		{
-			valerie_response real = valerie_response_clone( response->get_response( ) );
+			mvcp_response real = mvcp_response_clone( response->get_response( ) );
 			delete response;
 			return real;
 		}
@@ -59,99 +59,99 @@ static valerie_response mlt_miracle_received( void *arg, char *command, char *do
 	}
 	else
 	{
-		valerie_response response = valerie_response_init( );
-		valerie_response_set_error( response, 500, "Invalid server" );
+		mvcp_response response = mvcp_response_init( );
+		mvcp_response_set_error( response, 500, "Invalid server" );
 		return response;
 	}
 }
 
-static valerie_response mlt_miracle_push( void *arg, char *command, mlt_service service )
+static mvcp_response mlt_melted_push( void *arg, char *command, mlt_service service )
 {
-	Miracle *miracle = ( Miracle * )arg;
-	if ( miracle != NULL )
+	Melted *melted = ( Melted * )arg;
+	if ( melted != NULL )
 	{
 		Service input( service );
-		Response *response = miracle->push( command, &input );
-		valerie_response real = valerie_response_clone( response->get_response( ) );
+		Response *response = melted->push( command, &input );
+		mvcp_response real = mvcp_response_clone( response->get_response( ) );
 		delete response;
 		return real;
 	}
 	else
 	{
-		valerie_response response = valerie_response_init( );
-		valerie_response_set_error( response, 500, "Invalid server" );
+		mvcp_response response = mvcp_response_init( );
+		mvcp_response_set_error( response, 500, "Invalid server" );
 		return response;
 	}
 }
 
-Miracle::Miracle( char *name, int port, char *config ) :
+Melted::Melted( char *name, int port, char *config ) :
 	Properties( false )
 {
-	server = miracle_server_init( name );
-	miracle_server_set_port( server, port );
-	miracle_server_set_config( server, config );
+	server = melted_server_init( name );
+	melted_server_set_port( server, port );
+	melted_server_set_config( server, config );
 }
 
-Miracle::~Miracle( )
+Melted::~Melted( )
 {
-	miracle_server_close( server );
+	melted_server_close( server );
 }
 
-mlt_properties Miracle::get_properties( )
+mlt_properties Melted::get_properties( )
 {
 	return &server->parent;
 }
 
-bool Miracle::start( )
+bool Melted::start( )
 {
-	if ( miracle_server_execute( server ) == 0 )
+	if ( melted_server_execute( server ) == 0 )
 	{
 		_real = server->parser->real;
 		_execute = server->parser->execute;
 		_received = server->parser->received;
 		_push = server->parser->push;
 		server->parser->real = this;
-		server->parser->execute = mlt_miracle_execute;
-		server->parser->received = mlt_miracle_received;
-		server->parser->push = mlt_miracle_push;
+		server->parser->execute = mlt_melted_execute;
+		server->parser->received = mlt_melted_received;
+		server->parser->push = mlt_melted_push;
 	}
 	return server->shutdown == 0;
 }
 
-bool Miracle::is_running( )
+bool Melted::is_running( )
 {
 	return server->shutdown == 0;
 }
 
-Response *Miracle::execute( char *command )
+Response *Melted::execute( char *command )
 {
 	return new Response( _execute( _real, command ) );
 }
 
-Response *Miracle::received( char *command, char *doc )
+Response *Melted::received( char *command, char *doc )
 {
 	return new Response( _received( _real, command, doc ) );
 }
 
-Response *Miracle::push( char *command, Service *service )
+Response *Melted::push( char *command, Service *service )
 {
 	return new Response( _push( _real, command, service->get_service( ) ) );
 }
 
-void Miracle::wait_for_shutdown( )
+void Melted::wait_for_shutdown( )
 {
 	struct timespec tm = { 1, 0 };
 	while ( !server->shutdown )
 		nanosleep( &tm, NULL );
 }
 
-void Miracle::log_level( int threshold )
+void Melted::log_level( int threshold )
 {
-	miracle_log_init( log_stderr, threshold );
+	melted_log_init( log_stderr, threshold );
 }
 
-Properties *Miracle::unit( int index )
+Properties *Melted::unit( int index )
 {
-	mlt_properties properties = miracle_server_fetch_unit( server, index );
+	mlt_properties properties = melted_server_fetch_unit( server, index );
 	return properties != NULL ? new Properties( properties ) : NULL;
 }