X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2B%2B%2Fsrc%2FMltTransition.cpp;h=34fa531dcbc4c17b8109f255106a37891b24dd56;hb=55757b000043f6e370b9e963ce2e3542962c03c0;hp=2456a78de471caae76bbb35113d6e0c5f7009845;hpb=1a4cf7f5285d16d0530ea03c2b524be7c1aa5dbc;p=melted

diff --git a/mlt++/src/MltTransition.cpp b/mlt++/src/MltTransition.cpp
index 2456a78..34fa531 100644
--- a/mlt++/src/MltTransition.cpp
+++ b/mlt++/src/MltTransition.cpp
@@ -21,15 +21,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include "MltTransition.h"
+#include "MltProfile.h"
 using namespace Mlt;
 
-Transition::Transition( char *id, char *arg ) :
-	destroy( true ),
+Transition::Transition( Profile& profile, char *id, char *arg ) :
 	instance( NULL )
 {
 	if ( arg != NULL )
 	{
-		instance = mlt_factory_transition( id, arg );
+		instance = mlt_factory_transition( profile.get_profile(), id, arg );
 	}
 	else
 	{
@@ -38,32 +38,41 @@ Transition::Transition( char *id, char *arg ) :
 			char *temp = strdup( id );
 			char *arg = strchr( temp, ':' ) + 1;
 			*( arg - 1 ) = '\0';
-			instance = mlt_factory_transition( temp, arg );
+			instance = mlt_factory_transition( profile.get_profile(), temp, arg );
 			free( temp );
 		}
 		else
 		{
-			instance = mlt_factory_transition( id, NULL );
+			instance = mlt_factory_transition( profile.get_profile(), id, NULL );
 		}
 	}
 }
 
+Transition::Transition( Service &transition ) :
+	instance( NULL )
+{
+	if ( transition.type( ) == transition_type )
+	{
+		instance = ( mlt_transition )transition.get_service( );
+		inc_ref( );
+	}
+}
+
 Transition::Transition( Transition &transition ) :
-	destroy( false ),
 	instance( transition.get_transition( ) )
 {
+	inc_ref( );
 }
 
 Transition::Transition( mlt_transition transition ) :
-	destroy( false ),
 	instance( transition )
 {
+	inc_ref( );
 }
 
 Transition::~Transition( )
 {
-	if ( destroy )
-		mlt_transition_close( instance );
+	mlt_transition_close( instance );
 }
 
 mlt_transition Transition::get_transition( )
@@ -76,3 +85,7 @@ mlt_service Transition::get_service( )
 	return mlt_transition_service( get_transition( ) );
 }
 
+void Transition::set_in_and_out( int in, int out )
+{
+	mlt_transition_set_in_and_out( get_transition( ), in, out );
+}