From: Dan Dennedy Date: Fri, 15 May 2009 06:17:24 +0000 (-0700) Subject: Rename miracle, valerie, humperdink, and albino. X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=27f0329aa8f434794f1f18e018fc3221e58b77a4;p=melted Rename miracle, valerie, humperdink, and albino. Signed-off-by: Dan Dennedy --- diff --git a/AUTHORS b/AUTHORS index 89e7d76..bf1eeca 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,14 +1,2 @@ -MLT framework was developed by: Charles Yates - -MLT framework is maintained by: Dan Dennedy - -MLT module authors and maintainers: - -Charles Yates -Dan Dennedy -Stephane Fillod (effectv) -Marco Gittler (frei0r, oldfilm) -Jean-Baptiste Mardelle (kdenlive, qimage) -Zachary Drew (motion_est) diff --git a/configure b/configure index 72bbfe5..8dad6bc 100755 --- a/configure +++ b/configure @@ -1,12 +1,12 @@ #!/bin/sh export version=0.3.9 -export soversion=1 +export soversion=2 show_help() { cat << EOF -Non-autotool config script for MLT. +Non-autotool config script for Melted. Help options: @@ -20,7 +20,7 @@ General build options: --disable-debug - Compile without debug support (default: on) --disable-mmx - Compile without MMX support (default: on) --disable-sse - Compile without SSE support (default: on) - --arch='arch' - Compile for a specific architecture (default: none) + --arch='arch' - Compile for a specific architecture (default: none) --cpu='cpu' - Compile for a specific CPU (default: none) Module disables options: @@ -91,24 +91,18 @@ build_config() ;; esac echo "LIBSUF=$LIBSUF" - ) > config.mak - - echo "#!/bin/sh" > mlt-config - ( - echo export version=$version - echo export prefix=$prefix - echo export libdir=$libdir - echo export bindir=$prefix/bin - ) >> mlt-config + + echo "CFLAGS += `pkg-config --cflags mlt-framework`" + echo "LDFLAGS += `pkg-config --libs mlt-framework`" - cat < mlt-config-template >> mlt-config + ) > config.mak echo -n > packages.dat } build_pkgconfig() { - for i in framework valerie miracle + for i in mvcp melted melted++ do echo prefix="$prefix" > mlt-$i.pc ( @@ -225,16 +219,19 @@ else fi # Iterate through each of the components -for i in framework modules inigo valerie miracle humperdink +for i in mvcp melted melted++ mvcp-client modules do - if [ -x src/$i/configure ] + if [ "$gpl" = "true" -o ! -f src/$i/gpl ] then - [ $help = 0 ] && echo "Configuring `basename $i`:" - olddir=`pwd` - cd src/$i - ./configure "$@" - [ $? != 0 ] && exit 1 - cd $olddir + if [ -x src/$i/configure ] + then + [ $help = 0 ] && echo "Configuring `basename $i`:" + olddir=`pwd` + cd src/$i + ./configure "$@" + [ $? != 0 ] && exit 1 + cd $olddir + fi fi done diff --git a/docs/valerie.txt b/docs/libmvcp.txt similarity index 100% rename from docs/valerie.txt rename to docs/libmvcp.txt diff --git a/docs/dvcp.txt b/docs/mvcp.txt similarity index 100% rename from docs/dvcp.txt rename to docs/mvcp.txt diff --git a/mlt++/src/MltParser.cpp b/mlt++/src/MltParser.cpp deleted file mode 100644 index 5cd3c07..0000000 --- a/mlt++/src/MltParser.cpp +++ /dev/null @@ -1,284 +0,0 @@ -/** - * MltParser.cpp - MLT Wrapper - * Copyright (C) 2004-2005 Charles Yates - * Author: Charles Yates - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include "Mlt.h" -using namespace Mlt; - -static int on_invalid_cb( mlt_parser self, mlt_service object ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - Service service( object ); - return parser->on_invalid( &service ); -} - -static int on_unknown_cb( mlt_parser self, mlt_service object ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - Service service( object ); - return parser->on_unknown( &service ); -} - -static int on_start_producer_cb( mlt_parser self, mlt_producer object ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - Producer producer( object ); - return parser->on_start_producer( &producer ); -} - -static int on_end_producer_cb( mlt_parser self, mlt_producer object ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - Producer producer( object ); - return parser->on_end_producer( &producer ); -} - -static int on_start_playlist_cb( mlt_parser self, mlt_playlist object ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - Playlist playlist( object ); - return parser->on_start_playlist( &playlist ); -} - -static int on_end_playlist_cb( mlt_parser self, mlt_playlist object ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - Playlist playlist( object ); - return parser->on_end_playlist( &playlist ); -} - -static int on_start_tractor_cb( mlt_parser self, mlt_tractor object ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - Tractor tractor( object ); - return parser->on_start_tractor( &tractor ); -} - -static int on_end_tractor_cb( mlt_parser self, mlt_tractor object ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - Tractor tractor( object ); - return parser->on_end_tractor( &tractor ); -} - -static int on_start_multitrack_cb( mlt_parser self, mlt_multitrack object ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - Multitrack multitrack( object ); - return parser->on_start_multitrack( &multitrack ); -} - -static int on_end_multitrack_cb( mlt_parser self, mlt_multitrack object ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - Multitrack multitrack( object ); - return parser->on_end_multitrack( &multitrack ); -} - -static int on_start_track_cb( mlt_parser self ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - return parser->on_start_track( ); -} - -static int on_end_track_cb( mlt_parser self ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - return parser->on_end_track( ); -} - -static int on_start_filter_cb( mlt_parser self, mlt_filter object ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - Filter filter( object ); - return parser->on_start_filter( &filter ); -} - -static int on_end_filter_cb( mlt_parser self, mlt_filter object ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - Filter filter( object ); - return parser->on_end_filter( &filter ); -} - -static int on_start_transition_cb( mlt_parser self, mlt_transition object ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - Transition transition( object ); - return parser->on_start_transition( &transition ); -} - -static int on_end_transition_cb( mlt_parser self, mlt_transition object ) -{ - mlt_properties properties = mlt_parser_properties( self ); - Parser *parser = ( Parser * )mlt_properties_get_data( properties, "_parser_object", NULL ); - Transition transition( object ); - return parser->on_end_transition( &transition ); -} - -Parser::Parser( ) : - Properties( false ) -{ - parser = mlt_parser_new( ); - set( "_parser_object", this, 0 ); - parser->on_invalid = on_invalid_cb; - parser->on_unknown = on_unknown_cb; - parser->on_start_producer = on_start_producer_cb; - parser->on_end_producer = on_end_producer_cb; - parser->on_start_playlist = on_start_playlist_cb; - parser->on_end_playlist = on_end_playlist_cb; - parser->on_start_tractor = on_start_tractor_cb; - parser->on_end_tractor = on_end_tractor_cb; - parser->on_start_multitrack = on_start_multitrack_cb; - parser->on_end_multitrack = on_end_multitrack_cb; - parser->on_start_track = on_start_track_cb; - parser->on_end_track = on_end_track_cb; - parser->on_start_filter = on_start_filter_cb; - parser->on_end_filter = on_end_filter_cb; - parser->on_start_transition = on_start_transition_cb; - parser->on_end_transition = on_end_transition_cb; -} - -Parser::~Parser( ) -{ - mlt_parser_close( parser ); -} - -mlt_properties Parser::get_properties( ) -{ - return mlt_parser_properties( parser ); -} - -int Parser::start( Service &service ) -{ - return mlt_parser_start( parser, service.get_service( ) ); -} - -int Parser::on_invalid( Service *object ) -{ - object->debug( "Invalid" ); - return 0; -} - -int Parser::on_unknown( Service *object ) -{ - object->debug( "Unknown" ); - return 0; -} - -int Parser::on_start_producer( Producer *object ) -{ - object->debug( "on_start_producer" ); - return 0; -} - -int Parser::on_end_producer( Producer *object ) -{ - object->debug( "on_end_producer" ); - return 0; -} - -int Parser::on_start_playlist( Playlist *object ) -{ - object->debug( "on_start_playlist" ); - return 0; -} - -int Parser::on_end_playlist( Playlist *object ) -{ - object->debug( "on_end_playlist" ); - return 0; -} - -int Parser::on_start_tractor( Tractor *object ) -{ - object->debug( "on_start_tractor" ); - return 0; -} - -int Parser::on_end_tractor( Tractor *object ) -{ - object->debug( "on_end_tractor" ); - return 0; -} - -int Parser::on_start_multitrack( Multitrack *object ) -{ - object->debug( "on_start_multitrack" ); - return 0; -} - -int Parser::on_end_multitrack( Multitrack *object ) -{ - object->debug( "on_end_multitrack" ); - return 0; -} - -int Parser::on_start_track( ) -{ - fprintf( stderr, "on_start_track\n" ); - return 0; -} - -int Parser::on_end_track( ) -{ - fprintf( stderr, "on_end_track\n" ); - return 0; -} - -int Parser::on_start_filter( Filter *object ) -{ - object->debug( "on_start_filter" ); - return 0; -} - -int Parser::on_end_filter( Filter *object ) -{ - object->debug( "on_end_filter" ); - return 0; -} - -int Parser::on_start_transition( Transition *object ) -{ - object->debug( "on_start_transition" ); - return 0; -} - -int Parser::on_end_transition( Transition *object ) -{ - object->debug( "on_end_transition" ); - return 0; -} - - diff --git a/mlt++/src/MltParser.h b/mlt++/src/MltParser.h deleted file mode 100644 index b7ffc46..0000000 --- a/mlt++/src/MltParser.h +++ /dev/null @@ -1,68 +0,0 @@ -/** - * MltParser.h - MLT Wrapper - * Copyright (C) 2004-2005 Charles Yates - * Author: Charles Yates - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef _MLTPP_PARSER_H_ -#define _MLTPP_PARSER_H_ - -#include "config.h" - -#include -#include "MltProperties.h" - -namespace Mlt -{ - class Properties; - class Service; - class Producer; - class Playlist; - class Tractor; - class Multitrack; - class Filter; - class Transition; - - class MLTPP_DECLSPEC Parser : public Properties - { - private: - mlt_parser parser; - public: - Parser( ); - ~Parser( ); - int start( Service &service ); - virtual mlt_properties get_properties( ); - virtual int on_invalid( Service *object ); - virtual int on_unknown( Service *object ); - virtual int on_start_producer( Producer *object ); - virtual int on_end_producer( Producer *object ); - virtual int on_start_playlist( Playlist *object ); - virtual int on_end_playlist( Playlist *object ); - virtual int on_start_tractor( Tractor *object ); - virtual int on_end_tractor( Tractor *object ); - virtual int on_start_multitrack( Multitrack *object ); - virtual int on_end_multitrack( Multitrack *object ); - virtual int on_start_track( ); - virtual int on_end_track( ); - virtual int on_start_filter( Filter *object ); - virtual int on_end_filter( Filter *object ); - virtual int on_start_transition( Transition *object ); - virtual int on_end_transition( Transition *object ); - }; -} - -#endif diff --git a/mlt++/swig/java/Play.sh b/mlt++/swig/java/Play.sh deleted file mode 100755 index f2ba015..0000000 --- a/mlt++/swig/java/Play.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -java -Djava.library.path=. -cp .:src_swig Play "$@" diff --git a/mlt++/swig/mltpp.i b/mlt++/swig/mltpp.i deleted file mode 100644 index f6060b7..0000000 --- a/mlt++/swig/mltpp.i +++ /dev/null @@ -1,150 +0,0 @@ -/** - * mltpp.i - Swig Bindings for mlt++ - * Copyright (C) 2004-2005 Charles Yates - * Author: Charles Yates - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -%module mltpp -%include "carrays.i" -%array_class(unsigned char, unsignedCharArray); - -%{ -#include -%} - -/** These methods return objects which should be gc'd. - */ - -namespace Mlt { -%newobject Factory::init( const char * ); -%newobject Factory::producer( Profile &, char *, char * ); -%newobject Factory::filter( Profile &, char *, char * ); -%newobject Factory::transition( Profile &, char *, char * ); -%newobject Factory::consumer( Profile &, char *, char * ); -%newobject Properties::listen( char *, void *, mlt_listener ); -%newobject Service::producer( ); -%newobject Service::consumer( ); -%newobject Service::get_frame( int ); -%newobject Service::filter( int ); -%newobject Producer::filter( int ); -%newobject Producer::cut( int, int ); -%newobject Playlist::current( ); -%newobject Playlist::clip_info( int ); -%newobject Playlist::get_clip( int ); -%newobject Multitrack::track( int ); -%newobject Tractor::multitrack( ); -%newobject Tractor::field( ); -%newobject Tractor::track( int ); -%newobject Frame::get_original_producer( ); -%newobject Miracle::execute( char * ); -%newobject Miracle::push( char *, Service & ); -%newobject Miracle::unit( int ); -%newobject Repository::consumers( ); -%newobject Repository::filters( ); -%newobject Repository::producers( ); -%newobject Repository::transitions( ); -%newobject Repository::metadata( mlt_service_type, const char * ); -} - -/** Classes to wrap. - */ - -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include - -#if defined(SWIGRUBY) - -%{ - -static void ruby_listener( mlt_properties owner, void *object ); - -class RubyListener -{ - private: - VALUE callback; - Mlt::Event *event; - - public: - RubyListener( Mlt::Properties &properties, char *id, VALUE callback ) : - callback( callback ) - { - event = properties.listen( id, this, ( mlt_listener )ruby_listener ); - } - - ~RubyListener( ) - { - delete event; - } - - void mark( ) - { - ((void (*)(VALUE))(rb_gc_mark))( callback ); - } - - void doit( ) - { - ID method = rb_intern( "call" ); - rb_funcall( callback, method, 0 ); - } -}; - -static void ruby_listener( mlt_properties owner, void *object ) -{ - RubyListener *o = static_cast< RubyListener * >( object ); - o->doit( ); -} - -void markRubyListener( void* p ) -{ - RubyListener *o = static_cast( p ); - o->mark( ); -} - -%} - -// Ruby wrapper -%rename( Listener ) RubyListener; -%markfunc RubyListener "markRubyListener"; - -class RubyListener -{ - public: - RubyListener( Mlt::Properties &properties, char *id, VALUE callback ); -}; - -#endif - diff --git a/mlt-config-template b/mlt-config-template deleted file mode 100644 index 607d178..0000000 --- a/mlt-config-template +++ /dev/null @@ -1,32 +0,0 @@ -export package=framework -export field=0 - -while [ "$1" != "" ] -do - case $1 in - --help ) field=0 ;; - --version ) field=-1 ;; - --prefix ) field=-2 ;; - --prefix=* ) prefix="${i#--prefix=}" ;; - --cflags ) field=2 ;; - --libs ) field=3 ;; - --list ) field=1; package="" ;; - * ) package=$1 ;; - esac - shift -done - -if [ "$field" = "0" ] -then echo "Usage: mlt-config [ --version ] | [ --prefix=dir ] [ [ package ] [ --cflags ] [ --libs ] ]" -elif [ "$field" = "-1" ] -then echo $version -elif [ "$field" = "-2" ] -then config=`which mlt-config` - dir=`dirname $config` - dir=`dirname $dir` - echo $dir -elif [ -f "$prefix/share/mlt/packages.dat" ] -then grep "^$package" $prefix/share/mlt/packages.dat | cut -f $field -else echo mlt-config cannot find package $package. -fi -echo >&2 "mlt-config is deprecated. Please use pkg-config instead." diff --git a/mlt-melted++.pc.in b/mlt-melted++.pc.in new file mode 100644 index 0000000..e557ff8 --- /dev/null +++ b/mlt-melted++.pc.in @@ -0,0 +1,7 @@ + +Name: mlt-melted +Description: C++ API for MLT Miracle +Version: ${version} +Requires: +Libs: -L${libdir} ${libs} +Cflags: ${cflags} diff --git a/mlt-miracle.pc.in b/mlt-melted.pc.in similarity index 100% rename from mlt-miracle.pc.in rename to mlt-melted.pc.in diff --git a/mlt-valerie.pc.in b/mlt-mvcp.pc.in similarity index 100% rename from mlt-valerie.pc.in rename to mlt-mvcp.pc.in diff --git a/mlt++/test/Makefile b/src/examples/Makefile similarity index 100% rename from mlt++/test/Makefile rename to src/examples/Makefile diff --git a/mlt++/test/server.cpp b/src/examples/server.cpp similarity index 100% rename from mlt++/test/server.cpp rename to src/examples/server.cpp diff --git a/mlt++/src/Makefile b/src/melted++/Makefile similarity index 100% rename from mlt++/src/Makefile rename to src/melted++/Makefile diff --git a/mlt++/src/MltResponse.cpp b/src/melted++/MeltedResponse.cpp similarity index 100% rename from mlt++/src/MltResponse.cpp rename to src/melted++/MeltedResponse.cpp diff --git a/mlt++/src/MltResponse.h b/src/melted++/MeltedResponse.h similarity index 100% rename from mlt++/src/MltResponse.h rename to src/melted++/MeltedResponse.h diff --git a/mlt++/src/MltMiracle.cpp b/src/melted++/MltMelted.cpp similarity index 100% rename from mlt++/src/MltMiracle.cpp rename to src/melted++/MltMelted.cpp diff --git a/mlt++/src/MltMiracle.h b/src/melted++/MltMelted.h similarity index 100% rename from mlt++/src/MltMiracle.h rename to src/melted++/MltMelted.h diff --git a/mlt++/src/config.h b/src/melted++/config.h similarity index 100% rename from mlt++/src/config.h rename to src/melted++/config.h diff --git a/src/melted++/configure b/src/melted++/configure new file mode 100755 index 0000000..79620ce --- /dev/null +++ b/src/melted++/configure @@ -0,0 +1,22 @@ +#!/bin/sh +echo "soversion=0" > config.mak +echo "melted++ -I$prefix/include -I$prefix/include/melted++ -D_REENTRANT -L$libdir -lmelted++" >> ../../packages.dat + +WARNINGS="-W -Wwrite-strings -Wcast-qual -Wpointer-arith -Wcast-align -Wredundant-decls" + +targetos=$(uname -s) +case $targetos in + Darwin) + echo LIBSUF=.dylib + echo "CXXFLAGS+=-D__DARWIN__ -Wall -fPIC" + echo "LIBFLAGS=-dynamiclib -single_module" + ;; + Linux|FreeBSD) + echo LIBSUF=.so + echo "CXXFLAGS+=-Wall $WARNINGS -fPIC -dPIC" + echo "LIBFLAGS=-shared" + ;; +esac >> config.mak + +echo "CXXFLAGS += `pkg-config --cflags mlt++`" >> config.mak +echo "LDFLAGS += `pkg-config --libs mlt++`" >> config.mak diff --git a/src/melted++/gpl b/src/melted++/gpl new file mode 100644 index 0000000..e69de29 diff --git a/src/miracle/Makefile b/src/melted/Makefile similarity index 62% rename from src/miracle/Makefile rename to src/melted/Makefile index 2d92bfb..3159f72 100644 --- a/src/miracle/Makefile +++ b/src/melted/Makefile @@ -1,46 +1,46 @@ include ../../config.mak -TARGET = miracle +TARGET = melted ifneq ($(targetos), Darwin) -LIBNAME = libmiracle$(LIBSUF) +LIBNAME = libmelted$(LIBSUF) LIBTARGET = $(LIBNAME).$(version) LIBSONAME = $(LIBNAME).$(soversion) SHFLAGS += -Wl,-soname,$(LIBSONAME) else -LIBNAME = libmiracle$(LIBSUF) -LIBTARGET = libmiracle.$(version)$(LIBSUF) -LIBSONAME = libmiracle.$(soversion)$(LIBSUF) +LIBNAME = libmelted$(LIBSUF) +LIBTARGET = libmelted.$(version)$(LIBSUF) +LIBSONAME = libmelted.$(soversion)$(LIBSUF) SHFLAGS += -install_name $(libdir)/$(LIBSONAME) -current_version $(version) -compatibility_version $(soversion) endif -APP_OBJS = miracle.o +APP_OBJS = melted.o -LIB_OBJS = miracle_log.o \ - miracle_server.o \ - miracle_connection.o \ - miracle_local.o \ - miracle_unit.o \ - miracle_commands.o \ - miracle_unit_commands.o +LIB_OBJS = melted_log.o \ + melted_server.o \ + melted_connection.o \ + melted_local.o \ + melted_unit.o \ + melted_commands.o \ + melted_unit_commands.o -INCS = miracle_server.h \ - miracle_local.h \ - miracle_log.h +INCS = melted_server.h \ + melted_local.h \ + melted_log.h OBJS = $(APP_OBJS) $(LIB_OBJS) CFLAGS += -I.. $(RDYNAMIC) -LDFLAGS += -L../valerie -lvalerie -LDFLAGS += -L../framework -lmlt -lpthread +LDFLAGS += -L../mvcp -lmvcp +LDFLAGS += -lpthread SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(APP_OBJS) $(LIBTARGET) - $(CC) -o $@ $(APP_OBJS) -L. -lmiracle $(LDFLAGS) + $(CC) -o $@ $(APP_OBJS) -L. -lmelted $(LDFLAGS) $(LIBTARGET): $(LIB_OBJS) $(CC) $(SHFLAGS) -o $@ $(LIB_OBJS) $(LDFLAGS) @@ -62,15 +62,15 @@ install: all install -m 755 $(LIBTARGET) $(DESTDIR)$(libdir) ln -sf $(LIBTARGET) $(DESTDIR)$(libdir)/$(LIBSONAME) ln -sf $(LIBTARGET) $(DESTDIR)$(libdir)/$(LIBNAME) - mkdir -p "$(DESTDIR)$(prefix)/include/mlt/miracle" - install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/miracle" + mkdir -p "$(DESTDIR)$(prefix)/include/mlt/melted" + install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/melted" uninstall: rm -f "$(DESTDIR)$(bindir)/$(TARGET)" rm -f "$(DESTDIR)$(libdir)/$(LIBTARGET)" rm -f "$(DESTDIR)$(libdir)/$(LIBSONAME)" rm -f "$(DESTDIR)$(libdir)/$(LIBNAME)" - rm -rf "$(DESTDIR)$(prefix)/include/mlt/miracle" + rm -rf "$(DESTDIR)$(prefix)/include/mlt/melted" ifneq ($(wildcard .depend),) include .depend diff --git a/src/melted/configure b/src/melted/configure new file mode 100755 index 0000000..bd82dfc --- /dev/null +++ b/src/melted/configure @@ -0,0 +1,2 @@ +#!/bin/sh +echo "melted -I$prefix/include/mlt -D_REENTRANT -L$libdir -lmelted" >> ../../packages.dat diff --git a/src/melted/gpl b/src/melted/gpl new file mode 100644 index 0000000..e69de29 diff --git a/src/miracle/miracle.c b/src/melted/melted.c similarity index 100% rename from src/miracle/miracle.c rename to src/melted/melted.c diff --git a/src/miracle/miracle_commands.c b/src/melted/melted_commands.c similarity index 100% rename from src/miracle/miracle_commands.c rename to src/melted/melted_commands.c diff --git a/src/miracle/miracle_commands.h b/src/melted/melted_commands.h similarity index 100% rename from src/miracle/miracle_commands.h rename to src/melted/melted_commands.h diff --git a/src/miracle/miracle_connection.c b/src/melted/melted_connection.c similarity index 100% rename from src/miracle/miracle_connection.c rename to src/melted/melted_connection.c diff --git a/src/miracle/miracle_connection.h b/src/melted/melted_connection.h similarity index 100% rename from src/miracle/miracle_connection.h rename to src/melted/melted_connection.h diff --git a/src/miracle/miracle_local.c b/src/melted/melted_local.c similarity index 100% rename from src/miracle/miracle_local.c rename to src/melted/melted_local.c diff --git a/src/miracle/miracle_local.h b/src/melted/melted_local.h similarity index 100% rename from src/miracle/miracle_local.h rename to src/melted/melted_local.h diff --git a/src/miracle/miracle_log.c b/src/melted/melted_log.c similarity index 100% rename from src/miracle/miracle_log.c rename to src/melted/melted_log.c diff --git a/src/miracle/miracle_log.h b/src/melted/melted_log.h similarity index 100% rename from src/miracle/miracle_log.h rename to src/melted/melted_log.h diff --git a/src/miracle/miracle_server.c b/src/melted/melted_server.c similarity index 100% rename from src/miracle/miracle_server.c rename to src/melted/melted_server.c diff --git a/src/miracle/miracle_server.h b/src/melted/melted_server.h similarity index 100% rename from src/miracle/miracle_server.h rename to src/melted/melted_server.h diff --git a/src/miracle/miracle_unit.c b/src/melted/melted_unit.c similarity index 100% rename from src/miracle/miracle_unit.c rename to src/melted/melted_unit.c diff --git a/src/miracle/miracle_unit.h b/src/melted/melted_unit.h similarity index 100% rename from src/miracle/miracle_unit.h rename to src/melted/melted_unit.h diff --git a/src/miracle/miracle_unit_commands.c b/src/melted/melted_unit_commands.c similarity index 100% rename from src/miracle/miracle_unit_commands.c rename to src/melted/melted_unit_commands.c diff --git a/src/miracle/miracle_unit_commands.h b/src/melted/melted_unit_commands.h similarity index 100% rename from src/miracle/miracle_unit_commands.h rename to src/melted/melted_unit_commands.h diff --git a/src/miracle/configure b/src/miracle/configure deleted file mode 100755 index 85d890d..0000000 --- a/src/miracle/configure +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -echo "miracle -I$prefix/include/mlt -D_REENTRANT -L$libdir -lmiracle" >> ../../packages.dat diff --git a/src/modules/Makefile b/src/modules/Makefile new file mode 100644 index 0000000..fcbf3ea --- /dev/null +++ b/src/modules/Makefile @@ -0,0 +1,31 @@ +include ../../config.mak +include make.inc + +all clean depend: + list='$(SUBDIRS)'; \ + for subdir in $$list; do \ + if [ -f $$subdir/Makefile -a ! -f disable-$$subdir ] ; \ + then $(MAKE) -C $$subdir $@ || exit 1; \ + fi \ + done + +distclean: + rm -f consumers.dat filters.dat producers.dat transitions.dat make.inc; \ + list='$(SUBDIRS)'; \ + for subdir in $$list; do \ + if [ -f $$subdir/Makefile -a ! -f disable-$$subdir ] ; \ + then $(MAKE) -C $$subdir $@ || exit 1; \ + fi \ + done + +install: + list='$(SUBDIRS)'; \ + for subdir in $$list; do \ + if [ -f $$subdir/Makefile -a ! -f disable-$$subdir ] ; \ + then $(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \ + fi \ + done + +uninstall: + rm -rf "$(DESTDIR)$(libdir)/mlt" + diff --git a/src/modules/configure b/src/modules/configure new file mode 100755 index 0000000..e80a585 --- /dev/null +++ b/src/modules/configure @@ -0,0 +1,42 @@ +#!/bin/sh + +# Clean up disables if not in help mode +[ "$help" != "1" ] && rm -f disable-* producers.dat filters.dat transitions.dat consumers.dat + +# Create the make.inc file +echo SUBDIRS = `find . -maxdepth 1 -type d | grep -v .svn | grep -v "^.$" | sed 's/\.\///'` > make.inc + +# Iterate through arguments +for i in "$@" +do + case $i in + --disable-* ) touch disable-${i#--disable-} ;; + esac +done + +# Iterate through each of the components +for i in * +do + if [ -d $i -a \( "$help" = "1" -o ! -f disable-$i \) ] + then + if [ "$gpl" = "true" -o ! -f $i/gpl ] + then + [ -f $i/Makefile -a "$help" = "0" ] && echo "Configuring modules/$i:" + if [ -x $i/configure ] + then + olddir2=`pwd` + cd $i + ./configure "$@" + [ $? != 0 ] && exit 1 + cd $olddir2 + elif [ -f $i/configure ] + then + echo " configure script is not set executable!" + fi + elif [ "$help" = "0" ] + then + touch disable-$i + fi + fi +done + diff --git a/src/modules/mvsp/Makefile b/src/modules/mvcp/Makefile similarity index 100% rename from src/modules/mvsp/Makefile rename to src/modules/mvcp/Makefile diff --git a/src/modules/mvsp/configure b/src/modules/mvcp/configure similarity index 100% rename from src/modules/mvsp/configure rename to src/modules/mvcp/configure diff --git a/src/modules/mvsp/consumer_mvsp.c b/src/modules/mvcp/consumer_mvcp.c similarity index 100% rename from src/modules/mvsp/consumer_mvsp.c rename to src/modules/mvcp/consumer_mvcp.c diff --git a/src/modules/mvsp/factory.c b/src/modules/mvcp/factory.c similarity index 100% rename from src/modules/mvsp/factory.c rename to src/modules/mvcp/factory.c diff --git a/src/humperdink/Makefile b/src/mvcp-client/Makefile similarity index 84% rename from src/humperdink/Makefile rename to src/mvcp-client/Makefile index dd03dc9..cd31018 100644 --- a/src/humperdink/Makefile +++ b/src/mvcp-client/Makefile @@ -1,6 +1,6 @@ include ../../config.mak -TARGET = humperdink +TARGET = mvcp-client OBJS = client.o \ io.o \ @@ -8,8 +8,8 @@ OBJS = client.o \ CFLAGS += -I.. $(RDYNAMIC) -LDFLAGS += -L../valerie -lvalerie -LDFLAGS += -L../framework -lmlt -lpthread +LDFLAGS += -L../mvcp -lmvcp +LDFLAGS += -lpthread SRCS := $(OBJS:.o=.c) diff --git a/src/humperdink/client.c b/src/mvcp-client/client.c similarity index 100% rename from src/humperdink/client.c rename to src/mvcp-client/client.c diff --git a/src/humperdink/client.h b/src/mvcp-client/client.h similarity index 100% rename from src/humperdink/client.h rename to src/mvcp-client/client.h diff --git a/src/humperdink/io.c b/src/mvcp-client/io.c similarity index 100% rename from src/humperdink/io.c rename to src/mvcp-client/io.c diff --git a/src/humperdink/io.h b/src/mvcp-client/io.h similarity index 100% rename from src/humperdink/io.h rename to src/mvcp-client/io.h diff --git a/src/humperdink/remote.c b/src/mvcp-client/remote.c similarity index 100% rename from src/humperdink/remote.c rename to src/mvcp-client/remote.c diff --git a/src/albino/Makefile b/src/mvcp-console/Makefile similarity index 76% rename from src/albino/Makefile rename to src/mvcp-console/Makefile index 29bb3ee..6bb2d31 100644 --- a/src/albino/Makefile +++ b/src/mvcp-console/Makefile @@ -1,14 +1,14 @@ include ../../config.mak -TARGET = albino +TARGET = mvcp-console -OBJS = albino.o +OBJS = mvcp-console.o CFLAGS += -I.. $(RDYNAMIC) -LDFLAGS += -L../miracle -lmiracle -LDFLAGS += -L../valerie -lvalerie -LDFLAGS += -L../framework -lmlt -lpthread +LDFLAGS += -L../melted -lmelted +LDFLAGS += -L../mvcp -lmvcp +LDFLAGS += -lpthread SRCS := $(OBJS:.o=.c) diff --git a/src/albino/albino.c b/src/mvcp-console/mvcp-console.c similarity index 100% rename from src/albino/albino.c rename to src/mvcp-console/mvcp-console.c diff --git a/src/valerie/Makefile b/src/mvcp/Makefile similarity index 57% rename from src/valerie/Makefile rename to src/mvcp/Makefile index 52b61e1..4825766 100644 --- a/src/valerie/Makefile +++ b/src/mvcp/Makefile @@ -1,36 +1,36 @@ include ../../config.mak ifneq ($(targetos), Darwin) -NAME = libvalerie$(LIBSUF) +NAME = libmvcp$(LIBSUF) TARGET = $(NAME).$(version) SONAME = $(NAME).$(soversion) SHFLAGS += -Wl,-soname,$(SONAME) else -NAME = libvalerie$(LIBSUF) -TARGET = libvalerie.$(version)$(LIBSUF) -SONAME = libvalerie.$(soversion)$(LIBSUF) +NAME = libmvcp$(LIBSUF) +TARGET = libmvcp.$(version)$(LIBSUF) +SONAME = libmvcp.$(soversion)$(LIBSUF) SHFLAGS += -install_name $(libdir)/$(SONAME) -current_version $(version) -compatibility_version $(soversion) endif -OBJS = valerie.o \ - valerie_notifier.o \ - valerie_parser.o \ - valerie_response.o \ - valerie_status.o \ - valerie_tokeniser.o \ - valerie_util.o \ - valerie_remote.o \ - valerie_socket.o +OBJS = mvcp.o \ + mvcp_notifier.o \ + mvcp_parser.o \ + mvcp_response.o \ + mvcp_status.o \ + mvcp_tokeniser.o \ + mvcp_util.o \ + mvcp_remote.o \ + mvcp_socket.o -INCS = valerie.h \ - valerie_notifier.h \ - valerie_parser.h \ - valerie_remote.h \ - valerie_response.h \ - valerie_socket.h \ - valerie_status.h \ - valerie_tokeniser.h \ - valerie_util.h +INCS = mvcp.h \ + mvcp_notifier.h \ + mvcp_parser.h \ + mvcp_remote.h \ + mvcp_response.h \ + mvcp_socket.h \ + mvcp_status.h \ + mvcp_tokeniser.h \ + mvcp_util.h SRCS := $(OBJS:.o=.c) @@ -58,14 +58,14 @@ install: all install -m 755 $(TARGET) $(DESTDIR)$(libdir) ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(SONAME) ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(NAME) - mkdir -p "$(DESTDIR)$(prefix)/include/mlt/valerie" - install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/valerie" + mkdir -p "$(DESTDIR)$(prefix)/include/mlt/mvcp" + install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/mvcp" uninstall: rm -f "$(DESTDIR)$(libdir)/$(TARGET)" rm -f "$(DESTDIR)$(libdir)/$(SONAME)" rm -f "$(DESTDIR)$(libdir)/$(NAME)" - rm -rf "$(DESTDIR)$(prefix)/include/mlt/valerie" + rm -rf "$(DESTDIR)$(prefix)/include/mlt/mvcp" ifneq ($(wildcard .depend),) include .depend diff --git a/src/mvcp/configure b/src/mvcp/configure new file mode 100755 index 0000000..27ad366 --- /dev/null +++ b/src/mvcp/configure @@ -0,0 +1,2 @@ +#!/bin/sh +echo "mvcp -I$prefix/include/mlt -D_REENTRANT -L$libdir -lmvcp" >> ../../packages.dat diff --git a/src/valerie/valerie.c b/src/mvcp/mvcp.c similarity index 100% rename from src/valerie/valerie.c rename to src/mvcp/mvcp.c diff --git a/src/valerie/valerie.h b/src/mvcp/mvcp.h similarity index 100% rename from src/valerie/valerie.h rename to src/mvcp/mvcp.h diff --git a/src/valerie/valerie_notifier.c b/src/mvcp/mvcp_notifier.c similarity index 100% rename from src/valerie/valerie_notifier.c rename to src/mvcp/mvcp_notifier.c diff --git a/src/valerie/valerie_notifier.h b/src/mvcp/mvcp_notifier.h similarity index 100% rename from src/valerie/valerie_notifier.h rename to src/mvcp/mvcp_notifier.h diff --git a/src/valerie/valerie_parser.c b/src/mvcp/mvcp_parser.c similarity index 100% rename from src/valerie/valerie_parser.c rename to src/mvcp/mvcp_parser.c diff --git a/src/valerie/valerie_parser.h b/src/mvcp/mvcp_parser.h similarity index 100% rename from src/valerie/valerie_parser.h rename to src/mvcp/mvcp_parser.h diff --git a/src/valerie/valerie_remote.c b/src/mvcp/mvcp_remote.c similarity index 100% rename from src/valerie/valerie_remote.c rename to src/mvcp/mvcp_remote.c diff --git a/src/valerie/valerie_remote.h b/src/mvcp/mvcp_remote.h similarity index 100% rename from src/valerie/valerie_remote.h rename to src/mvcp/mvcp_remote.h diff --git a/src/valerie/valerie_response.c b/src/mvcp/mvcp_response.c similarity index 100% rename from src/valerie/valerie_response.c rename to src/mvcp/mvcp_response.c diff --git a/src/valerie/valerie_response.h b/src/mvcp/mvcp_response.h similarity index 100% rename from src/valerie/valerie_response.h rename to src/mvcp/mvcp_response.h diff --git a/src/valerie/valerie_socket.c b/src/mvcp/mvcp_socket.c similarity index 100% rename from src/valerie/valerie_socket.c rename to src/mvcp/mvcp_socket.c diff --git a/src/valerie/valerie_socket.h b/src/mvcp/mvcp_socket.h similarity index 100% rename from src/valerie/valerie_socket.h rename to src/mvcp/mvcp_socket.h diff --git a/src/valerie/valerie_status.c b/src/mvcp/mvcp_status.c similarity index 100% rename from src/valerie/valerie_status.c rename to src/mvcp/mvcp_status.c diff --git a/src/valerie/valerie_status.h b/src/mvcp/mvcp_status.h similarity index 100% rename from src/valerie/valerie_status.h rename to src/mvcp/mvcp_status.h diff --git a/src/valerie/valerie_tokeniser.c b/src/mvcp/mvcp_tokeniser.c similarity index 100% rename from src/valerie/valerie_tokeniser.c rename to src/mvcp/mvcp_tokeniser.c diff --git a/src/valerie/valerie_tokeniser.h b/src/mvcp/mvcp_tokeniser.h similarity index 100% rename from src/valerie/valerie_tokeniser.h rename to src/mvcp/mvcp_tokeniser.h diff --git a/src/valerie/valerie_util.c b/src/mvcp/mvcp_util.c similarity index 100% rename from src/valerie/valerie_util.c rename to src/mvcp/mvcp_util.c diff --git a/src/valerie/valerie_util.h b/src/mvcp/mvcp_util.h similarity index 100% rename from src/valerie/valerie_util.h rename to src/mvcp/mvcp_util.h diff --git a/mlt++/swig/Makefile b/src/swig/Makefile similarity index 100% rename from mlt++/swig/Makefile rename to src/swig/Makefile diff --git a/mlt++/swig/configure b/src/swig/configure similarity index 88% rename from mlt++/swig/configure rename to src/swig/configure index 794113a..6fe6319 100755 --- a/mlt++/swig/configure +++ b/src/swig/configure @@ -7,14 +7,14 @@ pkg-config mlt-framework --cflags > /dev/null 2>&1 [ $? != 0 ] && echo "Please install mlt" && exit 1 if [ "$1" = "all" ] -then languages="perl php python ruby tcl" +then languages="java perl php python ruby tcl" elif [ "$1" != "" ] then languages=$* else echo "Usage: ./configure [ all | language * ]" exit 0 fi -for i in perl php python ruby tcl +for i in java perl php python ruby tcl do rm -f .$i done diff --git a/mlt++/swig/java/build b/src/swig/java/build similarity index 100% rename from mlt++/swig/java/build rename to src/swig/java/build diff --git a/src/swig/melted.i b/src/swig/melted.i new file mode 100644 index 0000000..e261d1d --- /dev/null +++ b/src/swig/melted.i @@ -0,0 +1,42 @@ +/** + * melted.i - Swig Bindings for melted++ + * Copyright (C) 2004-2005 Charles Yates + * Author: Charles Yates + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +%module melted +%include "carrays.i" +%array_class(unsigned char, unsignedCharArray); + +%{ +#include +%} + +/** These methods return objects which should be gc'd. + */ + +namespace Mlt { +%newobject Melted::execute( char * ); +%newobject Melted::push( char *, Service & ); +%newobject Melted::unit( int ); +} + +/** Classes to wrap. + */ + +%include +%include diff --git a/mlt++/swig/perl/Makefile.PL b/src/swig/perl/Makefile.PL similarity index 100% rename from mlt++/swig/perl/Makefile.PL rename to src/swig/perl/Makefile.PL diff --git a/mlt++/swig/perl/build b/src/swig/perl/build similarity index 100% rename from mlt++/swig/perl/build rename to src/swig/perl/build diff --git a/mlt++/swig/php/build b/src/swig/php/build similarity index 100% rename from mlt++/swig/php/build rename to src/swig/php/build diff --git a/mlt++/swig/python/build b/src/swig/python/build similarity index 100% rename from mlt++/swig/python/build rename to src/swig/python/build diff --git a/mlt++/swig/ruby/build b/src/swig/ruby/build similarity index 100% rename from mlt++/swig/ruby/build rename to src/swig/ruby/build diff --git a/mlt++/swig/ruby/miracle.rb b/src/swig/ruby/melted.rb similarity index 100% rename from mlt++/swig/ruby/miracle.rb rename to src/swig/ruby/melted.rb diff --git a/mlt++/swig/tcl/build b/src/swig/tcl/build similarity index 100% rename from mlt++/swig/tcl/build rename to src/swig/tcl/build diff --git a/src/valerie/configure b/src/valerie/configure deleted file mode 100755 index 462e2de..0000000 --- a/src/valerie/configure +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -echo "valerie -I$prefix/include/mlt -D_REENTRANT -L$libdir -lvalerie" >> ../../packages.dat