Adding the mix part 1

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt++@413 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/mlt++/src/MltPlaylist.cpp b/mlt++/src/MltPlaylist.cpp
index 88d19f1..d85012f 100644 (file)
--- a/mlt++/src/MltPlaylist.cpp
+++ b/mlt++/src/MltPlaylist.cpp
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "MltPlaylist.h"
+#include "MltTransition.h"
 using namespace Mlt;
 
 ClipInfo::ClipInfo( mlt_playlist_clip_info *info ) :
@@ -158,3 +159,8 @@ int Playlist::join( int clip, int count, int merge )
 {
        return mlt_playlist_join( get_playlist( ), clip, count, merge );
 }
+
+int Playlist::mix( int clip, int length, Transition *transition )
+{
+       return mlt_playlist_mix( get_playlist( ), clip, length, transition == NULL ? NULL : transition->get_transition( ) );
+}

diff --git a/mlt++/src/MltPlaylist.h b/mlt++/src/MltPlaylist.h
index 7a6e175..ece8bed 100644 (file)
--- a/mlt++/src/MltPlaylist.h
+++ b/mlt++/src/MltPlaylist.h
@@ -30,6 +30,7 @@ namespace Mlt
        class Producer;
        class Service;
        class Playlist;
+       class Transition;
 
        class ClipInfo
        {
@@ -74,6 +75,7 @@ namespace Mlt
                        int resize_clip( int clip, int in, int out );
                        int split( int clip, int position );
                        int join( int clip, int count = 1, int merge = 1 );
+                       int mix( int clip, int length, Transition *transition = NULL );
        };
 }