-include ../config.mak
+include ../../config.mak
+include config.mak
INSTALL = install
ifneq ($(targetos), Darwin)
-NAME = libmlt++$(LIBSUF)
+NAME = libmelted++$(LIBSUF)
TARGET = $(NAME).$(version)
SONAME = $(NAME).$(soversion)
LIBFLAGS += -Wl,-soname,$(SONAME)
else
-NAME = libmlt++$(LIBSUF)
-TARGET = libmlt++.$(version)$(LIBSUF)
-SONAME = libmlt++.$(soversion)$(LIBSUF)
+NAME = libmelted++$(LIBSUF)
+TARGET = libmelted++.$(version)$(LIBSUF)
+SONAME = libmelted++.$(soversion)$(LIBSUF)
LIBFLAGS += -install_name $(libdir)/$(SONAME) -current_version $(version) -compatibility_version $(soversion)
endif
-OBJS = MltConsumer.o \
- MltDeque.o \
- MltEvent.o \
- MltFactory.o \
- MltField.o \
- MltFilter.o \
- MltFilteredConsumer.o \
- MltFrame.o \
- MltGeometry.o \
- MltMiracle.o \
- MltMultitrack.o \
- MltParser.o \
- MltPlaylist.o \
- MltProducer.o \
- MltProfile.o \
- MltProperties.o \
- MltPushConsumer.o \
- MltRepository.o \
- MltResponse.o \
- MltService.o \
- MltTokeniser.o \
- MltTractor.o \
- MltTransition.o
+CXXFLAGS += -I.. $(RDYNAMIC) -DVERSION=\"$(version)\"
+
+LDFLAGS += -L../melted -lmelted -L../mvcp -lmvcp
+
+OBJS = MltMelted.o \
+ MltResponse.o
SRCS = $(OBJS:.o=.cpp)
-HEADERS = config.h Mlt.h $(OBJS:.o=.h)
+HEADERS = config.h $(OBJS:.o=.h)
all: $(TARGET)
$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(libdir)
ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(NAME)
ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(SONAME)
- $(INSTALL) -d "$(DESTDIR)$(prefix)/include/mlt++"
- $(INSTALL) -m 644 $(HEADERS) "$(DESTDIR)$(prefix)/include/mlt++"
- /sbin/ldconfig 2> /dev/null || true
+ $(INSTALL) -d "$(DESTDIR)$(prefix)/include/melted++"
+ $(INSTALL) -m 644 $(HEADERS) "$(DESTDIR)$(prefix)/include/melted++"
+ /sbin/ldconfig -n "$(DESTDIR)$(liobdir)" 2> /dev/null || true
uninstall:
rm -f "$(DESTDIR)$(libdir)/$(TARGET)"
rm -f "$(DESTDIR)$(libdir)/$(NAME)"
rm -f "$(DESTDIR)$(libdir)/$(SONAME)"
- rm -rf "$(DESTDIR)$(prefix)/include/mlt++"
+ rm -rf "$(DESTDIR)$(prefix)/include/melted++"
+
+ifneq ($(wildcard .depend),)
+include .depend
+endif
/**
- * 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
* 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;
}
}
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;
}
/**
- * MltMiracle.h - MLT Wrapper
- * Copyright (C) 2004-2005 Charles Yates
+ * MltMelted.h - 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
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef _MLTPP_MIRACLE_H_
-#define _MLTPP_MIRACLE_H_
+#ifndef _MLTPP_MELTED_H_
+#define _MLTPP_MELTED_H_
-#include <miracle/miracle_server.h>
-#include <miracle/miracle_log.h>
-#include "MltService.h"
+#include <melted/melted_server.h>
+#include <melted/melted_log.h>
+#include <MltService.h>
namespace Mlt
{
class Service;
class Response;
- class Miracle : public Properties
+ class Melted : public Properties
{
private:
- miracle_server server;
+ melted_server server;
void *_real;
parser_execute _execute;
parser_received _received;
parser_push _push;
public:
- Miracle( char *name, int port = 5250, char *config = NULL );
- virtual ~Miracle( );
+ Melted( char *name, int port = 5250, char *config = NULL );
+ virtual ~Melted( );
mlt_properties get_properties( );
bool start( );
bool is_running( );
/**
- * MltResponse.cpp - MLT Wrapper
- * Copyright (C) 2004-2005 Charles Yates
+ * MltResponse.cpp - MLT MVCP 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
#include "MltResponse.h"
using namespace Mlt;
-Response::Response( valerie_response response ) :
+Response::Response( mvcp_response response ) :
_response( response )
{
}
Response::Response( int error, const char *message ) :
_response( NULL )
{
- _response = valerie_response_init( );
+ _response = mvcp_response_init( );
if ( _response != NULL )
- valerie_response_set_error( _response, error, message );
+ mvcp_response_set_error( _response, error, message );
}
Response::~Response( )
{
- valerie_response_close( _response );
+ mvcp_response_close( _response );
}
-valerie_response Response::get_response( )
+mvcp_response Response::get_response( )
{
return _response;
}
int Response::error_code( )
{
- return valerie_response_get_error_code( get_response( ) );
+ return mvcp_response_get_error_code( get_response( ) );
}
const char *Response::error_string( )
{
- return valerie_response_get_error_string( get_response( ) );
+ return mvcp_response_get_error_string( get_response( ) );
}
char *Response::get( int index )
{
- return valerie_response_get_line( get_response( ), index );
+ return mvcp_response_get_line( get_response( ), index );
}
int Response::count( )
{
- return valerie_response_count( get_response( ) );
+ return mvcp_response_count( get_response( ) );
}
int Response::write( const char *data )
{
- return valerie_response_write( get_response( ), data, strlen( data ) );
+ return mvcp_response_write( get_response( ), data, strlen( data ) );
}
/**
- * MltResponse.h - MLT Wrapper
- * Copyright (C) 2004-2005 Charles Yates
+ * MltResponse.h - MLT MVCP 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
#ifndef _MLTPP_RESPONSE_H_
#define _MLTPP_RESPONSE_H_
-#include <valerie/valerie_response.h>
+#include <mvcp/mvcp_response.h>
namespace Mlt
{
class Response
{
private:
- valerie_response _response;
+ mvcp_response _response;
public:
- Response( valerie_response response );
+ Response( mvcp_response response );
Response( int error, const char *message );
~Response( );
- valerie_response get_response( );
+ mvcp_response get_response( );
int error_code( );
const char *error_string( );
char *get( int );
/**
- * config.h - Convenience header file for all mlt++ objects
- * Copyright (C) 2004-2005 Charles Yates
+ * config.h - Convenience header file for all melted++ objects
+ * 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
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef MLTPP_CONFIG_H_
-#define MLTPP_CONFIG_H_
+#ifndef MELTEDPP_CONFIG_H_
+#define MELTEDPP_CONFIG_H_
#ifdef WIN32
- #ifdef MLTPP_EXPORTS
- #define MLTPP_DECLSPEC __declspec( dllexport )
+ #ifdef MELTEDPP_EXPORTS
+ #define MELTEDPP_DECLSPEC __declspec( dllexport )
#else
- #define MLTPP_DECLSPEC __declspec( dllimport )
+ #define MELTEDPP_DECLSPEC __declspec( dllimport )
#endif
#else
- #define MLTPP_DECLSPEC
+ #define MELTEDPP_DECLSPEC
#endif
#endif
projects / melted / commitdiff