From 0737f19add6d02cc1a040f2c72a22abd05a27eac Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Thu, 9 Sep 2004 11:11:47 +0000 Subject: [PATCH 1/1] Adding the mix part 1 git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt++@413 d19143bc-622f-0410-bfdd-b5b2a6649095 --- mlt++/src/MltPlaylist.cpp | 6 ++++++ mlt++/src/MltPlaylist.h | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/mlt++/src/MltPlaylist.cpp b/mlt++/src/MltPlaylist.cpp index 88d19f1..d85012f 100644 --- a/mlt++/src/MltPlaylist.cpp +++ b/mlt++/src/MltPlaylist.cpp @@ -21,6 +21,7 @@ #include #include #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 --- 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 ); }; } -- 1.7.4.4