Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Rename miracle, valerie, humperdink, and albino.

Signed-off-by: Dan Dennedy <dan@dennedy.org>
  • Loading branch information...
commit 27f0329aa8f434794f1f18e018fc3221e58b77a4 1 parent f5a4388
@ddennedy ddennedy authored
Showing with 224 additions and 631 deletions.
  1. +0 −12 AUTHORS
  2. +19 −22 configure
  3. 0  docs/{valerie.txt → libmvcp.txt}
  4. 0  docs/{dvcp.txt → mvcp.txt}
  5. +0 −284 mlt++/src/MltParser.cpp
  6. +0 −68 mlt++/src/MltParser.h
  7. +0 −2  mlt++/swig/java/Play.sh
  8. +0 −150 mlt++/swig/mltpp.i
  9. +0 −32 mlt-config-template
  10. +7 −0 mlt-melted++.pc.in
  11. 0  mlt-miracle.pc.in → mlt-melted.pc.in
  12. 0  mlt-valerie.pc.in → mlt-mvcp.pc.in
  13. 0  {mlt++/test → src/examples}/Makefile
  14. 0  {mlt++/test → src/examples}/server.cpp
  15. 0  {mlt++/src → src/melted++}/Makefile
  16. 0  mlt++/src/MltResponse.cpp → src/melted++/MeltedResponse.cpp
  17. 0  mlt++/src/MltResponse.h → src/melted++/MeltedResponse.h
  18. 0  mlt++/src/MltMiracle.cpp → src/melted++/MltMelted.cpp
  19. 0  mlt++/src/MltMiracle.h → src/melted++/MltMelted.h
  20. 0  {mlt++/src → src/melted++}/config.h
  21. +22 −0 src/melted++/configure
  22. 0  src/melted++/gpl
  23. +22 −22 src/{miracle → melted}/Makefile
  24. +2 −0  src/melted/configure
  25. 0  src/melted/gpl
  26. 0  src/{miracle/miracle.c → melted/melted.c}
  27. 0  src/{miracle/miracle_commands.c → melted/melted_commands.c}
  28. 0  src/{miracle/miracle_commands.h → melted/melted_commands.h}
  29. 0  src/{miracle/miracle_connection.c → melted/melted_connection.c}
  30. 0  src/{miracle/miracle_connection.h → melted/melted_connection.h}
  31. 0  src/{miracle/miracle_local.c → melted/melted_local.c}
  32. 0  src/{miracle/miracle_local.h → melted/melted_local.h}
  33. 0  src/{miracle/miracle_log.c → melted/melted_log.c}
  34. 0  src/{miracle/miracle_log.h → melted/melted_log.h}
  35. 0  src/{miracle/miracle_server.c → melted/melted_server.c}
  36. 0  src/{miracle/miracle_server.h → melted/melted_server.h}
  37. 0  src/{miracle/miracle_unit.c → melted/melted_unit.c}
  38. 0  src/{miracle/miracle_unit.h → melted/melted_unit.h}
  39. 0  src/{miracle/miracle_unit_commands.c → melted/melted_unit_commands.c}
  40. 0  src/{miracle/miracle_unit_commands.h → melted/melted_unit_commands.h}
  41. +0 −2  src/miracle/configure
  42. +31 −0 src/modules/Makefile
  43. +42 −0 src/modules/configure
  44. 0  src/modules/{mvsp → mvcp}/Makefile
  45. 0  src/modules/{mvsp → mvcp}/configure
  46. 0  src/modules/{mvsp/consumer_mvsp.c → mvcp/consumer_mvcp.c}
  47. 0  src/modules/{mvsp → mvcp}/factory.c
  48. +3 −3 src/{humperdink → mvcp-client}/Makefile
  49. 0  src/{humperdink → mvcp-client}/client.c
  50. 0  src/{humperdink → mvcp-client}/client.h
  51. 0  src/{humperdink → mvcp-client}/io.c
  52. 0  src/{humperdink → mvcp-client}/io.h
  53. 0  src/{humperdink → mvcp-client}/remote.c
  54. +5 −5 src/{albino → mvcp-console}/Makefile
  55. 0  src/{albino/albino.c → mvcp-console/mvcp-console.c}
  56. +25 −25 src/{valerie → mvcp}/Makefile
  57. +2 −0  src/mvcp/configure
  58. 0  src/{valerie/valerie.c → mvcp/mvcp.c}
  59. 0  src/{valerie/valerie.h → mvcp/mvcp.h}
  60. 0  src/{valerie/valerie_notifier.c → mvcp/mvcp_notifier.c}
  61. 0  src/{valerie/valerie_notifier.h → mvcp/mvcp_notifier.h}
  62. 0  src/{valerie/valerie_parser.c → mvcp/mvcp_parser.c}
  63. 0  src/{valerie/valerie_parser.h → mvcp/mvcp_parser.h}
  64. 0  src/{valerie/valerie_remote.c → mvcp/mvcp_remote.c}
  65. 0  src/{valerie/valerie_remote.h → mvcp/mvcp_remote.h}
  66. 0  src/{valerie/valerie_response.c → mvcp/mvcp_response.c}
  67. 0  src/{valerie/valerie_response.h → mvcp/mvcp_response.h}
  68. 0  src/{valerie/valerie_socket.c → mvcp/mvcp_socket.c}
  69. 0  src/{valerie/valerie_socket.h → mvcp/mvcp_socket.h}
  70. 0  src/{valerie/valerie_status.c → mvcp/mvcp_status.c}
  71. 0  src/{valerie/valerie_status.h → mvcp/mvcp_status.h}
  72. 0  src/{valerie/valerie_tokeniser.c → mvcp/mvcp_tokeniser.c}
  73. 0  src/{valerie/valerie_tokeniser.h → mvcp/mvcp_tokeniser.h}
  74. 0  src/{valerie/valerie_util.c → mvcp/mvcp_util.c}
  75. 0  src/{valerie/valerie_util.h → mvcp/mvcp_util.h}
  76. 0  {mlt++ → src}/swig/Makefile
  77. +2 −2 {mlt++ → src}/swig/configure
  78. 0  {mlt++ → src}/swig/java/build
  79. +42 −0 src/swig/melted.i
  80. 0  {mlt++ → src}/swig/perl/Makefile.PL
  81. 0  {mlt++ → src}/swig/perl/build
  82. 0  {mlt++ → src}/swig/php/build
  83. 0  {mlt++ → src}/swig/python/build
  84. 0  {mlt++ → src}/swig/ruby/build
  85. 0  mlt++/swig/ruby/miracle.rb → src/swig/ruby/melted.rb
  86. 0  {mlt++ → src}/swig/tcl/build
  87. +0 −2  src/valerie/configure
View
12 AUTHORS
@@ -1,14 +1,2 @@
-MLT framework was developed by:
Charles Yates <charles.yates@pandora.be>
-
-MLT framework is maintained by:
Dan Dennedy <dan@dennedy.org>
-
-MLT module authors and maintainers:
-
-Charles Yates <charles.yates@pandora.be>
-Dan Dennedy <dan@dennedy.org>
-Stephane Fillod (effectv)
-Marco Gittler <g.marco@freenet.de> (frei0r, oldfilm)
-Jean-Baptiste Mardelle <jb@ader.ch> (kdenlive, qimage)
-Zachary Drew (motion_est)
View
41 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
View
0  docs/valerie.txt → docs/libmvcp.txt
File renamed without changes
View
0  docs/dvcp.txt → docs/mvcp.txt
File renamed without changes
View
284 mlt++/src/MltParser.cpp
@@ -1,284 +0,0 @@
-/**
- * MltParser.cpp - MLT Wrapper
- * Copyright (C) 2004-2005 Charles Yates
- * Author: Charles Yates <charles.yates@pandora.be>
- *
- * 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;
-}
-
-
View
68 mlt++/src/MltParser.h
@@ -1,68 +0,0 @@
-/**
- * MltParser.h - MLT Wrapper
- * Copyright (C) 2004-2005 Charles Yates
- * Author: Charles Yates <charles.yates@pandora.be>
- *
- * 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 <framework/mlt.h>
-#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
View
2  mlt++/swig/java/Play.sh
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -Djava.library.path=. -cp .:src_swig Play "$@"
View
150 mlt++/swig/mltpp.i
@@ -1,150 +0,0 @@
-/**
- * mltpp.i - Swig Bindings for mlt++
- * Copyright (C) 2004-2005 Charles Yates
- * Author: Charles Yates <charles.yates@pandora.be>
- *
- * 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 <mlt++/Mlt.h>
-%}
-
-/** 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 <framework/mlt_types.h>
-%include <framework/mlt_factory.h>
-%include <MltFactory.h>
-%include <MltRepository.h>
-%include <MltEvent.h>
-%include <MltProperties.h>
-%include <MltFrame.h>
-%include <MltGeometry.h>
-%include <MltService.h>
-%include <MltProducer.h>
-%include <MltProfile.h>
-%include <MltPlaylist.h>
-%include <MltConsumer.h>
-%include <MltFilter.h>
-%include <MltTransition.h>
-%include <MltMultitrack.h>
-%include <MltField.h>
-%include <MltTractor.h>
-%include <MltParser.h>
-%include <MltFilteredConsumer.h>
-%include <MltMiracle.h>
-%include <MltResponse.h>
-
-#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<RubyListener*>( p );
- o->mark( );
-}
-
-%}
-
-// Ruby wrapper
-%rename( Listener ) RubyListener;
-%markfunc RubyListener "markRubyListener";
-
-class RubyListener
-{
- public:
- RubyListener( Mlt::Properties &properties, char *id, VALUE callback );
-};
-
-#endif
-
View
32 mlt-config-template
@@ -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."
View
7 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}
View
0  mlt-miracle.pc.in → mlt-melted.pc.in
File renamed without changes
View
0  mlt-valerie.pc.in → mlt-mvcp.pc.in
File renamed without changes
View
0  mlt++/test/Makefile → src/examples/Makefile
File renamed without changes
View
0  mlt++/test/server.cpp → src/examples/server.cpp
File renamed without changes
View
0  mlt++/src/Makefile → src/melted++/Makefile
File renamed without changes
View
0  mlt++/src/MltResponse.cpp → src/melted++/MeltedResponse.cpp
File renamed without changes
View
0  mlt++/src/MltResponse.h → src/melted++/MeltedResponse.h
File renamed without changes
View
0  mlt++/src/MltMiracle.cpp → src/melted++/MltMelted.cpp
File renamed without changes
View
0  mlt++/src/MltMiracle.h → src/melted++/MltMelted.h
File renamed without changes
View
0  mlt++/src/config.h → src/melted++/config.h
File renamed without changes
View
22 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
View
0  src/melted++/gpl
No changes.
View
44 src/miracle/Makefile → 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
View
2  src/melted/configure
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "melted -I$prefix/include/mlt -D_REENTRANT -L$libdir -lmelted" >> ../../packages.dat
View
0  src/melted/gpl
No changes.
View
0  src/miracle/miracle.c → src/melted/melted.c
File renamed without changes
View
0  src/miracle/miracle_commands.c → src/melted/melted_commands.c
File renamed without changes
View
0  src/miracle/miracle_commands.h → src/melted/melted_commands.h
File renamed without changes
View
0  src/miracle/miracle_connection.c → src/melted/melted_connection.c
File renamed without changes
View
0  src/miracle/miracle_connection.h → src/melted/melted_connection.h
File renamed without changes
View
0  src/miracle/miracle_local.c → src/melted/melted_local.c
File renamed without changes
View
0  src/miracle/miracle_local.h → src/melted/melted_local.h
File renamed without changes
View
0  src/miracle/miracle_log.c → src/melted/melted_log.c
File renamed without changes
View
0  src/miracle/miracle_log.h → src/melted/melted_log.h
File renamed without changes
View
0  src/miracle/miracle_server.c → src/melted/melted_server.c
File renamed without changes
View
0  src/miracle/miracle_server.h → src/melted/melted_server.h
File renamed without changes
View
0  src/miracle/miracle_unit.c → src/melted/melted_unit.c
File renamed without changes
View
0  src/miracle/miracle_unit.h → src/melted/melted_unit.h
File renamed without changes
View
0  src/miracle/miracle_unit_commands.c → src/melted/melted_unit_commands.c
File renamed without changes
View
0  src/miracle/miracle_unit_commands.h → src/melted/melted_unit_commands.h
File renamed without changes
View
2  src/miracle/configure
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo "miracle -I$prefix/include/mlt -D_REENTRANT -L$libdir -lmiracle" >> ../../packages.dat
View
31 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"
+
View
42 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
+
View
0  src/modules/mvsp/Makefile → src/modules/mvcp/Makefile
File renamed without changes
View
0  src/modules/mvsp/configure → src/modules/mvcp/configure
File renamed without changes
View
0  src/modules/mvsp/consumer_mvsp.c → src/modules/mvcp/consumer_mvcp.c
File renamed without changes
View
0  src/modules/mvsp/factory.c → src/modules/mvcp/factory.c
File renamed without changes
View
6 src/humperdink/Makefile → 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)
View
0  src/humperdink/client.c → src/mvcp-client/client.c
File renamed without changes
View
0  src/humperdink/client.h → src/mvcp-client/client.h
File renamed without changes
View
0  src/humperdink/io.c → src/mvcp-client/io.c
File renamed without changes
View
0  src/humperdink/io.h → src/mvcp-client/io.h
File renamed without changes
View
0  src/humperdink/remote.c → src/mvcp-client/remote.c
File renamed without changes
View
10 src/albino/Makefile → 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)
View
0  src/albino/albino.c → src/mvcp-console/mvcp-console.c
File renamed without changes
View
50 src/valerie/Makefile → 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
View
2  src/mvcp/configure
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "mvcp -I$prefix/include/mlt -D_REENTRANT -L$libdir -lmvcp" >> ../../packages.dat
View
0  src/valerie/valerie.c → src/mvcp/mvcp.c
File renamed without changes
View
0  src/valerie/valerie.h → src/mvcp/mvcp.h
File renamed without changes
View
0  src/valerie/valerie_notifier.c → src/mvcp/mvcp_notifier.c
File renamed without changes
View
0  src/valerie/valerie_notifier.h → src/mvcp/mvcp_notifier.h
File renamed without changes
View
0  src/valerie/valerie_parser.c → src/mvcp/mvcp_parser.c
File renamed without changes
View
0  src/valerie/valerie_parser.h → src/mvcp/mvcp_parser.h
File renamed without changes
View
0  src/valerie/valerie_remote.c → src/mvcp/mvcp_remote.c
File renamed without changes
View
0  src/valerie/valerie_remote.h → src/mvcp/mvcp_remote.h
File renamed without changes
View
0  src/valerie/valerie_response.c → src/mvcp/mvcp_response.c
File renamed without changes
View
0  src/valerie/valerie_response.h → src/mvcp/mvcp_response.h
File renamed without changes
View
0  src/valerie/valerie_socket.c → src/mvcp/mvcp_socket.c
File renamed without changes
View
0  src/valerie/valerie_socket.h → src/mvcp/mvcp_socket.h
File renamed without changes
View
0  src/valerie/valerie_status.c → src/mvcp/mvcp_status.c
File renamed without changes
View
0  src/valerie/valerie_status.h → src/mvcp/mvcp_status.h
File renamed without changes
View
0  src/valerie/valerie_tokeniser.c → src/mvcp/mvcp_tokeniser.c
File renamed without changes
View
0  src/valerie/valerie_tokeniser.h → src/mvcp/mvcp_tokeniser.h
File renamed without changes
View
0  src/valerie/valerie_util.c → src/mvcp/mvcp_util.c
File renamed without changes
View
0  src/valerie/valerie_util.h → src/mvcp/mvcp_util.h
File renamed without changes
View
0  mlt++/swig/Makefile → src/swig/Makefile
File renamed without changes
View
4 mlt++/swig/configure → 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
View
0  mlt++/swig/java/build → src/swig/java/build
File renamed without changes
View
42 src/swig/melted.i
@@ -0,0 +1,42 @@
+/**
+ * melted.i - Swig Bindings for melted++
+ * Copyright (C) 2004-2005 Charles Yates
+ * Author: Charles Yates <charles.yates@pandora.be>
+ *
+ * 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 <melted++/MltMelted.h>
+%}
+
+/** 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 <MltMiracle.h>
+%include <MltResponse.h>
View
0  mlt++/swig/perl/Makefile.PL → src/swig/perl/Makefile.PL
File renamed without changes
View
0  mlt++/swig/perl/build → src/swig/perl/build
File renamed without changes
View
0  mlt++/swig/php/build → src/swig/php/build
File renamed without changes
View
0  mlt++/swig/python/build → src/swig/python/build
File renamed without changes
View
0  mlt++/swig/ruby/build → src/swig/ruby/build
File renamed without changes
View
0  mlt++/swig/ruby/miracle.rb → src/swig/ruby/melted.rb
File renamed without changes
View
0  mlt++/swig/tcl/build → src/swig/tcl/build
File renamed without changes
View
2  src/valerie/configure
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo "valerie -I$prefix/include/mlt -D_REENTRANT -L$libdir -lvalerie" >> ../../packages.dat
Please sign in to comment.
Something went wrong with that request. Please try again.