X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2B%2B%2Fsrc%2FMltProducer.cpp;h=4302243902f23ab4144fa26a2f779c3f1e1044f0;hb=d32f9b6ac490bed3b4712b8868db535054816931;hp=96d9017a4a9bb5b523a057e938c1648e1fef4710;hpb=0caa0a91b0971439dfe00d0ed9bc05992b7dd609;p=melted

diff --git a/mlt++/src/MltProducer.cpp b/mlt++/src/MltProducer.cpp
index 96d9017..4302243 100644
--- a/mlt++/src/MltProducer.cpp
+++ b/mlt++/src/MltProducer.cpp
@@ -20,26 +20,30 @@
 
 #include "MltProducer.h"
 #include "MltFilter.h"
+#include "MltProfile.h"
 using namespace Mlt;
 
 Producer::Producer( ) :
-	instance( NULL )
+	instance( NULL ),
+	parent_( NULL )
 {
 }
 
-Producer::Producer( char *id, char *service ) :
-	instance( NULL )
+Producer::Producer( Profile& profile, const char *id, const char *service ) :
+	instance( NULL ),
+	parent_( NULL )
 {
 	if ( id != NULL && service != NULL )
-		instance = mlt_factory_producer( id, service );
+		instance = mlt_factory_producer( profile.get_profile(), id, service );
 	else
-		instance = mlt_factory_producer( "fezzik", id != NULL ? id : service );
+		instance = mlt_factory_producer( profile.get_profile(), "fezzik", id != NULL ? id : service );
 }
 
 Producer::Producer( Service &producer ) :
-	instance( NULL )
+	instance( NULL ),
+	parent_( NULL )
 {
-	service_type type = producer.type( );
+	mlt_service_type type = producer.type( );
 	if ( type == producer_type || type == playlist_type || 
 		 type == tractor_type || type == multitrack_type )
 	{
@@ -49,20 +53,33 @@ Producer::Producer( Service &producer ) :
 }
 
 Producer::Producer( mlt_producer producer ) :
-	instance( producer )
+	instance( producer ),
+	parent_( NULL )
 {
 	inc_ref( );
 }
 
 Producer::Producer( Producer &producer ) :
-	instance( producer.get_producer( ) )
+	Mlt::Service( producer ),
+	instance( producer.get_producer( ) ),
+	parent_( NULL )
 {
 	inc_ref( );
 }
 
+Producer::Producer( Producer *producer ) :
+	instance( producer != NULL ? producer->get_producer( ) : NULL ),
+	parent_( NULL )
+{
+	if ( is_valid( ) )
+		inc_ref( );
+}
+
 Producer::~Producer( )
 {
+	delete parent_;
 	mlt_producer_close( instance );
+	instance = NULL;
 }
 
 mlt_producer Producer::get_producer( )
@@ -70,6 +87,18 @@ 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( );
+}
+
+Producer &Producer::parent( )
+{
+	if ( is_cut( ) && parent_ == NULL )
+		parent_ = new Producer( get_parent( ) );
+	return parent_ == NULL ? *this : *parent_;
+}
+
 mlt_service Producer::get_service( )
 {
 	return mlt_producer_service( get_producer( ) );
@@ -130,17 +159,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( ) ) != 0;
+}
+
+bool Producer::is_blank( )
+{
+	return mlt_producer_is_blank( get_producer( ) ) != 0;
+}
+
+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( ) );
 }