X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2B%2B%2Fsrc%2FMltProducer.cpp;h=ab0527cea78401b66e3a6283fd6822df4e13d582;hb=43df55b16132c0fd064266c5148c5ac2835c9880;hp=c0bfa491db32e41631a83766b1dd76fc592e4f6d;hpb=01c1d44e8df201c3061cf20addf5421d21d8bcb0;p=melted

diff --git a/mlt++/src/MltProducer.cpp b/mlt++/src/MltProducer.cpp
index c0bfa49..ab0527c 100644
--- a/mlt++/src/MltProducer.cpp
+++ b/mlt++/src/MltProducer.cpp
@@ -19,24 +19,73 @@
  */
 
 #include "MltProducer.h"
+#include "MltFilter.h"
 using namespace Mlt;
 
+Producer::Producer( ) :
+	instance( NULL )
+{
+}
+
+Producer::Producer( char *id, char *service ) :
+	instance( NULL )
+{
+	if ( id != NULL && service != NULL )
+		instance = mlt_factory_producer( id, service );
+	else
+		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 )
+{
+	inc_ref( );
+}
+
+Producer::Producer( Producer &producer ) :
+	instance( producer.get_producer( ) )
+{
+	inc_ref( );
+}
+
+Producer::~Producer( )
+{
+	mlt_producer_close( instance );
+}
+
+mlt_producer Producer::get_producer( )
+{
+	return instance;
+}
+
 mlt_service Producer::get_service( )
 {
 	return mlt_producer_service( get_producer( ) );
 }
 	
-int Producer::seek( mlt_position position )
+int Producer::seek( int position )
 {
 	return mlt_producer_seek( get_producer( ), position );
 }
 
-mlt_position Producer::position( )
+int Producer::position( )
 {
 	return mlt_producer_position( get_producer( ) );
 }
 
-mlt_position Producer::frame( )
+int Producer::frame( )
 {
 	return mlt_producer_frame( get_producer( ) );
 }
@@ -56,61 +105,45 @@ double Producer::get_fps( )
 	return mlt_producer_get_fps( get_producer( ) );
 }
 
-int Producer::set_in_and_out( mlt_position in, mlt_position out )
+int Producer::set_in_and_out( int in, int out )
 {
 	return mlt_producer_set_in_and_out( get_producer( ), in, out );
 }
 
-mlt_position Producer::get_in( )
+int Producer::get_in( )
 {
 	return mlt_producer_get_in( get_producer( ) );
 }
 
-mlt_position Producer::get_out( )
+int Producer::get_out( )
 {
 	return mlt_producer_get_out( get_producer( ) );
 }
 
-mlt_position Producer::get_length( )
+int Producer::get_length( )
 {
 	return mlt_producer_get_length( get_producer( ) );
 }
 
-mlt_position Producer::get_playtime( )
+int Producer::get_playtime( )
 {
 	return mlt_producer_get_playtime( get_producer( ) );
 }
 
-mlt_producer ProducerInstance::get_producer( )
+Producer *Producer::cut( int in, int out )
 {
-	return instance;
+	mlt_producer producer = mlt_producer_cut( get_producer( ), in, out );
+	Producer *result = new Producer( producer );
+	mlt_producer_close( producer );
+	return result;
 }
 
-ProducerInstance::ProducerInstance( char *id, char *service ) :
-	destroy( true ),
-	instance( NULL )
+bool Producer::same_clip( Producer &that )
 {
-	if ( id != NULL && service != NULL )
-		instance = mlt_factory_producer( id, service );
-	else
-		instance = mlt_factory_producer( "fezzik", id != NULL ? id : service );
+	return mlt_producer_cut_parent( get_producer( ) ) == mlt_producer_cut_parent( that.get_producer( ) );
 }
 
-ProducerInstance::ProducerInstance( mlt_producer producer ) :
-	destroy( false ),
-	instance( producer )
+bool Producer::runs_into( Producer &that )
 {
+	return same_clip( that ) && get_out( ) == ( that.get_in( ) - 1 );
 }
-
-ProducerInstance::ProducerInstance( Producer &producer ) :
-	destroy( false ),
-	instance( producer.get_producer( ) )
-{
-}
-
-ProducerInstance::~ProducerInstance( )
-{
-	if ( destroy )
-		mlt_producer_close( instance );
-}
-