X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2B%2B%2Fsrc%2FMltProducer.cpp;h=e98e513a1772de54040b73841bf738fd1b9a1ef9;hb=ef7d73ce9bf11e071aafbcf74d1900d9cdeb7537;hp=8eae08cb395c172a4afb6940e02de08ebbcd8bc5;hpb=cdf2dbd4142d046054baf2f675ff5bec30bb449a;p=melted

diff --git a/mlt++/src/MltProducer.cpp b/mlt++/src/MltProducer.cpp
index 8eae08c..e98e513 100644
--- a/mlt++/src/MltProducer.cpp
+++ b/mlt++/src/MltProducer.cpp
@@ -20,24 +20,28 @@
 
 #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, char *id, 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 )
 {
 	mlt_service_type type = producer.type( );
 	if ( type == producer_type || type == playlist_type || 
@@ -49,20 +53,32 @@ 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( ) )
+	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( )
@@ -75,6 +91,13 @@ 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( ) );
@@ -145,12 +168,12 @@ Producer *Producer::cut( int in, int out )
 
 bool Producer::is_cut( )
 {
-	return mlt_producer_is_cut( get_producer( ) );
+	return mlt_producer_is_cut( get_producer( ) ) != 0;
 }
 
 bool Producer::is_blank( )
 {
-	return mlt_producer_is_blank( get_producer( ) );
+	return mlt_producer_is_blank( get_producer( ) ) != 0;
 }
 
 bool Producer::same_clip( Producer &that )
@@ -167,3 +190,12 @@ void Producer::optimise( )
 {
 	mlt_producer_optimise( get_producer( ) );
 }
+
+Frame* Producer::get_frame( int index )
+{
+	mlt_frame f = NULL;
+	int result = get_producer()->get_frame( get_producer(), &f, index );
+	if ( f )
+		return new Frame( f );
+	return NULL;
+}