Update bindings.

diff --git a/src/mlt++/MltField.cpp b/src/mlt++/MltField.cpp
index a362a3498261f8efb4d6b97f2ef9cbf006de6809..97db56be75cda438ae2a8c4d586850a73b1108ee 100644 (file)
--- a/src/mlt++/MltField.cpp
+++ b/src/mlt++/MltField.cpp
@@ -61,4 +61,8 @@ int Field::plant_transition( Transition &transition, int a_track, int b_track )
        return mlt_field_plant_transition( get_field( ), transition.get_transition( ), a_track, b_track );
 }
 
+void Field::disconnect_service( Service &service )
+{
+       mlt_field_disconnect_service( get_field(), service.get_service() );
+}
 

diff --git a/src/mlt++/MltField.h b/src/mlt++/MltField.h
index 026ec9cbc9c8fcbe2829c9f3fcd9bf069aa6dff6..ba9c801c29a1fe8970983293556bce8231670417 100644 (file)
--- a/src/mlt++/MltField.h
+++ b/src/mlt++/MltField.h
@@ -45,6 +45,7 @@ namespace Mlt
                        mlt_service get_service( );
                        int plant_filter( Filter &filter, int track = 0 );
                        int plant_transition( Transition &transition, int a_track = 0, int b_track = 1 );
+                       void disconnect_service( Service &service );
        };
 }
 

diff --git a/src/mlt++/MltProducer.cpp b/src/mlt++/MltProducer.cpp
index 151bc8d0c02e7f88163aef6edffe89c786f7e7f6..e12dd42ce0223ac4a2c53433b74e049fdafb4925 100644 (file)
--- a/src/mlt++/MltProducer.cpp
+++ b/src/mlt++/MltProducer.cpp
@@ -191,3 +191,8 @@ void Producer::optimise( )
 {
        mlt_producer_optimise( get_producer( ) );
 }
+
+int Producer::clear( )
+{
+       return mlt_producer_clear( get_producer( ) );
+}

diff --git a/src/mlt++/MltProducer.h b/src/mlt++/MltProducer.h
index b3f2617ba93443efa680543aada0b5a0e3f1e833..77615a79661c26169d83d40d1f31bbbd66f5ae53 100644 (file)
--- a/src/mlt++/MltProducer.h
+++ b/src/mlt++/MltProducer.h
@@ -68,6 +68,7 @@ namespace Mlt
                        bool same_clip( Producer &that );
                        bool runs_into( Producer &that );
                        void optimise( );
+                       int clear( );
        };
 }
 

diff --git a/src/mlt++/MltProperties.cpp b/src/mlt++/MltProperties.cpp
index 58b8cea7dad64d0e8929abc6008bdb2b39efc183..030fa9b4572fd9d6dbb91ca8decbac8a017aa314 100644 (file)
--- a/src/mlt++/MltProperties.cpp
+++ b/src/mlt++/MltProperties.cpp
@@ -117,6 +117,11 @@ int Properties::get_int( const char *name )
        return mlt_properties_get_int( get_properties( ), name );
 }
 
+int64_t Properties::get_int64( const char *name )
+{
+       return mlt_properties_get_int64( get_properties( ), name );
+}
+
 double Properties::get_double( const char *name )
 {
        return mlt_properties_get_double( get_properties( ), name );
@@ -142,6 +147,11 @@ int Properties::set( const char *name, int value )
        return mlt_properties_set_int( get_properties( ), name, value );
 }
 
+int Properties::set( const char *name, int64_t value )
+{
+       return mlt_properties_set_int64( get_properties( ), name, value );
+}
+
 int Properties::set( const char *name, double value )
 {
        return mlt_properties_set_double( get_properties( ), name, value );
@@ -152,11 +162,21 @@ int Properties::set( const char *name, void *value, int size, mlt_destructor des
        return mlt_properties_set_data( get_properties( ), name, value, size, destructor, serialiser );
 }
 
+void Properties::pass_property( Properties &that, const char *name )
+{
+       return mlt_properties_pass_property( get_properties( ), that.get_properties( ), name );
+}
+
 int Properties::pass_values( Properties &that, const char *prefix )
 {
        return mlt_properties_pass( get_properties( ), that.get_properties( ), prefix );
 }
 
+int Properties::pass_list( Properties &that, const char *list )
+{
+       return mlt_properties_pass_list( get_properties( ), that.get_properties( ), list );
+}
+
 int Properties::parse( const char *namevalue )
 {
        return mlt_properties_parse( get_properties( ), namevalue );
@@ -265,3 +285,17 @@ void Properties::wait_for( Event *event, bool destroy )
                mlt_events_close_wait_for( get_properties( ), event->get_event( ) );
 }
 
+bool Properties::is_sequence( )
+{
+       return mlt_properties_is_sequence( get_properties( ) );
+}
+
+Properties *Properties::parse_yaml( const char *file )
+{
+       return new Properties( mlt_properties_parse_yaml( file ) );
+}
+
+char *Properties::serialise_yaml( )
+{
+       return mlt_properties_serialise_yaml( get_properties( ) );
+}

diff --git a/src/mlt++/MltProperties.h b/src/mlt++/MltProperties.h
index 64a31e38da29653563c1d3e6202bf9b36da85ef9..9026510cd044e4a316cedf926601fc7466e25dfc 100644 (file)
--- a/src/mlt++/MltProperties.h
+++ b/src/mlt++/MltProperties.h
@@ -56,14 +56,18 @@ namespace Mlt
                        int count( );
                        char *get( const char *name );
                        int get_int( const char *name );
+                       int64_t get_int64( const char *name );
                        double get_double( const char *name );
                        void *get_data( const char *name, int &size );
                        void *get_data( const char *name );
                        int set( const char *name, const char *value );
                        int set( const char *name, int value );
+                       int set( const char *name, int64_t value );
                        int set( const char *name, double value );
                        int set( const char *name, void *value, int size, mlt_destructor destroy = NULL, mlt_serialiser serial = NULL );
+                       void pass_property( Properties &that, const char *name );
                        int pass_values( Properties &that, const char *prefix );
+                       int pass_list( Properties &that, const char *list );
                        int parse( const char *namevalue );
                        char *get_name( int index );
                        char *get( int index );
@@ -83,6 +87,9 @@ namespace Mlt
                        static void delete_event( Event * );
                        Event *setup_wait_for( const char *id );
                        void wait_for( Event *, bool destroy = true );
+                       bool is_sequence( );
+                       static Properties *parse_yaml( const char *file );
+                       char *serialise_yaml( );
        };
 }
 

diff --git a/src/mlt++/MltRepository.cpp b/src/mlt++/MltRepository.cpp
index 3b45f1d3ab90838205240f7925968d74ea7e9e94..387607968b85b57916103bed62f3d72550a12bb8 100644 (file)
--- a/src/mlt++/MltRepository.cpp
+++ b/src/mlt++/MltRepository.cpp
@@ -79,3 +79,8 @@ Properties *Repository::metadata( mlt_service_type type, const char *service ) c
 {
        return new Properties( mlt_repository_metadata( instance, type, service ) );
 }
+
+Properties *Repository::languages( ) const
+{
+       return new Properties( mlt_repository_languages( instance ) );
+}

diff --git a/src/mlt++/MltRepository.h b/src/mlt++/MltRepository.h
index cbe01c032ce37c9afed769ba2de45db125e320a1..efce9f29c59cf339372c0dbce7133945ccc2ad2d 100644 (file)
--- a/src/mlt++/MltRepository.h
+++ b/src/mlt++/MltRepository.h
@@ -51,6 +51,7 @@ namespace Mlt
                        Properties *transitions( ) const;
                        void register_metadata( mlt_service_type type, const char *service, mlt_metadata_callback, void *callback_data );
                        Properties *metadata( mlt_service_type type, const char *service ) const;
+                       Properties *languages( ) const;
        };
 }
 

diff --git a/src/mlt++/MltTractor.cpp b/src/mlt++/MltTractor.cpp
index 2ee99aba07b6d9ba9096f235f5bf434b8e61c7e8..749186e5b9308600daa56e954ecfca2024758017 100644 (file)
--- a/src/mlt++/MltTractor.cpp
+++ b/src/mlt++/MltTractor.cpp
@@ -157,3 +157,8 @@ bool Tractor::locate_cut( Producer *producer, int &track, int &cut )
 
        return found;
 }
+
+int Tractor::connect( Producer &producer )
+{
+       return mlt_tractor_connect( get_tractor( ), producer.get_service( ) );
+}

diff --git a/src/mlt++/MltTractor.h b/src/mlt++/MltTractor.h
index 15b00148e90148ea99c4822978e7723082e85abd..8d9abea52881c5580ba0d7698beb5e48b11dc110 100644 (file)
--- a/src/mlt++/MltTractor.h
+++ b/src/mlt++/MltTractor.h
@@ -60,6 +60,7 @@ namespace Mlt
                        void plant_filter( Filter &filter, int track = 0 );
                        void plant_filter( Filter *filter, int track = 0 );
                        bool locate_cut( Producer *producer, int &track, int &cut );
+                       int connect( Producer &producer );
        };
 }
 

diff --git a/src/mlt++/MltTransition.cpp b/src/mlt++/MltTransition.cpp
index 123de135bcbfbd2056ac865ad6f1b49bb3288ae8..01079291b6cbb398bed5c72d34c8faec3c3a67b3 100644 (file)
--- a/src/mlt++/MltTransition.cpp
+++ b/src/mlt++/MltTransition.cpp
@@ -22,6 +22,7 @@
 #include <string.h>
 #include "MltTransition.h"
 #include "MltProfile.h"
+#include "MltProducer.h"
 using namespace Mlt;
 
 Transition::Transition( Profile& profile, const char *id, const char *arg ) :
@@ -90,3 +91,28 @@ void Transition::set_in_and_out( int in, int out )
 {
        mlt_transition_set_in_and_out( get_transition( ), in, out );
 }
+
+int Transition::connect( Producer &producer, int a_track, int b_track )
+{
+       return mlt_transition_connect( get_transition(), producer.get_service(), a_track, b_track );
+}
+
+int Transition::get_a_track( )
+{
+       return mlt_transition_get_a_track( get_transition() );
+}
+
+int Transition::get_b_track( )
+{
+       return mlt_transition_get_b_track( get_transition() );
+}
+
+int Transition::get_in( )
+{
+       return mlt_transition_get_in( get_transition() );
+}
+
+int Transition::get_out( )
+{
+       return mlt_transition_get_out( get_transition() );
+}

diff --git a/src/mlt++/MltTransition.h b/src/mlt++/MltTransition.h
index bd84332b985e9110dea791e212b63b3cd35b2c5a..fb736344e8364bd2ed227bfe81af65be0ee24920 100644 (file)
--- a/src/mlt++/MltTransition.h
+++ b/src/mlt++/MltTransition.h
@@ -44,6 +44,11 @@ namespace Mlt
                        virtual mlt_transition get_transition( );
                        mlt_service get_service( );
                        void set_in_and_out( int in, int out );
+                       int connect( Producer &producer, int a_track, int b_track );
+                       int get_a_track( );
+                       int get_b_track( );
+                       int get_in( );
+                       int get_out( );
        };
 }
 

diff --git a/src/swig/mlt.i b/src/swig/mlt.i
index 84a7184d6f20148b988da9b2d860ea390d13e9c5..5f3fef77e94754570f32ffb9131b13a8f9343a7a 100644 (file)
--- a/src/swig/mlt.i
+++ b/src/swig/mlt.i
@@ -35,7 +35,8 @@ namespace Mlt {
 %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 Properties::listen( const char *, void *, mlt_listener );
+%newobject Properties::parse_yaml( const char * );
 %newobject Service::producer( );
 %newobject Service::consumer( );
 %newobject Service::get_frame( int );
@@ -55,6 +56,7 @@ namespace Mlt {
 %newobject Repository::producers( );
 %newobject Repository::transitions( );
 %newobject Repository::metadata( mlt_service_type, const char * );
+%newobject Repository::languages( );
 }
 
 /** Classes to wrap.
@@ -62,6 +64,7 @@ namespace Mlt {
 
 %include <framework/mlt_types.h>
 %include <framework/mlt_factory.h>
+%include <framework/mlt_log.h>
 %include <MltFactory.h>
 %include <MltRepository.h>
 %include <MltEvent.h>