Permalink
Browse files

Rename miracle, valerie, humperdink, and albino.

Signed-off-by: Dan Dennedy <dan@dennedy.org>
  • Loading branch information...
1 parent f5a4388 commit 27f0329aa8f434794f1f18e018fc3221e58b77a4 @ddennedy ddennedy committed May 15, 2009
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
@@ -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
File renamed without changes.
File renamed without changes.
View
@@ -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;
-}
-
-
Oops, something went wrong.

0 comments on commit 27f0329

Please sign in to comment.