More playlist modifications; service locking

[melted] / mlt++ / src / MltProducer.cpp

diff --git a/mlt++/src/MltProducer.cpp b/mlt++/src/MltProducer.cpp
index a12c1da..54473e7 100644 (file)
--- a/mlt++/src/MltProducer.cpp
+++ b/mlt++/src/MltProducer.cpp
@@ -36,6 +36,18 @@ Producer::Producer( char *id, char *service ) :
                instance = mlt_factory_producer( "fezzik", id != NULL ? id : service );
 }
 
+Producer::Producer( Service &producer ) :
+       instance( NULL )
+{
+       mlt_service_type type = producer.type( );
+       if ( type == producer_type || type == playlist_type || 
+                type == tractor_type || type == multitrack_type )
+       {
+               instance = ( mlt_producer )producer.get_service( );
+               inc_ref( );
+       }
+}
+
 Producer::Producer( mlt_producer producer ) :
        instance( producer )
 {
@@ -48,9 +60,17 @@ Producer::Producer( Producer &producer ) :
        inc_ref( );
 }
 
+Producer::Producer( Producer *producer ) :
+       instance( producer != NULL ? producer->get_producer( ) : NULL )
+{
+       if ( is_valid( ) )
+               inc_ref( );
+}
+
 Producer::~Producer( )
 {
        mlt_producer_close( instance );
+       instance = NULL;
 }
 
 mlt_producer Producer::get_producer( )
@@ -58,6 +78,11 @@ mlt_producer Producer::get_producer( )
        return instance;
 }
 
+mlt_producer Producer::get_parent( )
+{
+       return get_producer( ) != NULL && mlt_producer_cut_parent( get_producer( ) ) != NULL ? mlt_producer_cut_parent( get_producer( ) ) : get_producer( );
+}
+
 mlt_service Producer::get_service( )
 {
        return mlt_producer_service( get_producer( ) );
@@ -118,17 +143,35 @@ int Producer::get_playtime( )
        return mlt_producer_get_playtime( get_producer( ) );
 }
 
-int Producer::attach( Filter &filter )
+Producer *Producer::cut( int in, int out )
+{
+       mlt_producer producer = mlt_producer_cut( get_producer( ), in, out );
+       Producer *result = new Producer( producer );
+       mlt_producer_close( producer );
+       return result;
+}
+
+bool Producer::is_cut( )
+{
+       return mlt_producer_is_cut( get_producer( ) );
+}
+
+bool Producer::is_blank( )
+{
+       return mlt_producer_is_blank( get_producer( ) );
+}
+
+bool Producer::same_clip( Producer &that )
 {
-       return mlt_producer_attach( get_producer( ), filter.get_filter( ) );
+       return mlt_producer_cut_parent( get_producer( ) ) == mlt_producer_cut_parent( that.get_producer( ) );
 }
 
-int Producer::detach( Filter &filter )
+bool Producer::runs_into( Producer &that )
 {
-       return mlt_producer_detach( get_producer( ), filter.get_filter( ) );
+       return same_clip( that ) && get_out( ) == ( that.get_in( ) - 1 );
 }
 
-Filter *Producer::filter( int index )
+void Producer::optimise( )
 {
-       return new Filter( mlt_producer_filter( get_producer( ), index ) );
+       mlt_producer_optimise( get_producer( ) );
 }