X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2B%2B%2Fsrc%2FMltProducer.cpp;h=31ace144312f268ed8f1960b313fb81814be7326;hb=6d06b0de2cb66cf093bf24d9ed02fac18756105e;hp=5a536c7b9825e921a591299531892cf878b8098a;hpb=96f33fa9a85baf3b53d1a6961a70bb6f123fa11a;p=melted

diff --git a/mlt++/src/MltProducer.cpp b/mlt++/src/MltProducer.cpp
index 5a536c7..31ace14 100644
--- a/mlt++/src/MltProducer.cpp
+++ b/mlt++/src/MltProducer.cpp
@@ -19,16 +19,15 @@
  */
 
 #include "MltProducer.h"
+#include "MltFilter.h"
 using namespace Mlt;
 
 Producer::Producer( ) :
-	destroy( false ),
 	instance( NULL )
 {
 }
 
 Producer::Producer( char *id, char *service ) :
-	destroy( true ),
 	instance( NULL )
 {
 	if ( id != NULL && service != NULL )
@@ -37,22 +36,33 @@ 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 ) :
-	destroy( false ),
 	instance( producer )
 {
+	inc_ref( );
 }
 
 Producer::Producer( Producer &producer ) :
-	destroy( false ),
 	instance( producer.get_producer( ) )
 {
+	inc_ref( );
 }
 
 Producer::~Producer( )
 {
-	if ( destroy )
-		mlt_producer_close( instance );
+	mlt_producer_close( instance );
 }
 
 mlt_producer Producer::get_producer( )
@@ -60,6 +70,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( ) );
@@ -120,3 +135,25 @@ int Producer::get_playtime( )
 	return mlt_producer_get_playtime( get_producer( ) );
 }
 
+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::same_clip( Producer &that )
+{
+	return mlt_producer_cut_parent( get_producer( ) ) == mlt_producer_cut_parent( that.get_producer( ) );
+}
+
+bool Producer::runs_into( Producer &that )
+{
+	return same_clip( that ) && get_out( ) == ( that.get_in( ) - 1 );
+}