X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_playlist.h;h=d51dacb2068486cc34adb3734cd5aa5bda49de58;hb=b917ae819659606f59b3ae761d06ab2095ade658;hp=7bad6db38e8ac6487fae3a7eb0f312ec27f29e46;hpb=ebe424a8561adf11509de6a1ed504ce07a8abdaf;p=melted

diff --git a/src/framework/mlt_playlist.h b/src/framework/mlt_playlist.h
index 7bad6db..d51dacb 100644
--- a/src/framework/mlt_playlist.h
+++ b/src/framework/mlt_playlist.h
@@ -30,6 +30,7 @@ typedef struct
 {
 	int clip;
 	mlt_producer producer;
+	mlt_producer cut;
 	mlt_position start;
 	char *resource;
 	mlt_position frame_in;
@@ -37,6 +38,7 @@ typedef struct
 	mlt_position frame_count;
 	mlt_position length;
 	float fps;
+	mlt_event event;
 }
 mlt_playlist_clip_info;
 
@@ -44,23 +46,26 @@ mlt_playlist_clip_info;
 */
 
 extern mlt_playlist mlt_playlist_init( );
-extern mlt_producer mlt_playlist_producer( mlt_playlist this );
-extern mlt_service mlt_playlist_service( mlt_playlist this );
-extern mlt_properties mlt_playlist_properties( mlt_playlist this );
-extern int mlt_playlist_count( mlt_playlist this );
-extern int mlt_playlist_clear( mlt_playlist this );
-extern int mlt_playlist_append( mlt_playlist this, mlt_producer producer );
-extern int mlt_playlist_append_io( mlt_playlist this, mlt_producer producer, mlt_position in, mlt_position out );
-extern int mlt_playlist_blank( mlt_playlist this, mlt_position length );
-extern mlt_position mlt_playlist_clip( mlt_playlist this, mlt_whence whence, int index );
-extern int mlt_playlist_current_clip( mlt_playlist this );
-extern mlt_producer mlt_playlist_current( mlt_playlist this );
-extern int mlt_playlist_get_clip_info( mlt_playlist this, mlt_playlist_clip_info *info, int index );
-extern int mlt_playlist_insert( mlt_playlist this, mlt_producer producer, int where, mlt_position in, mlt_position out );
-extern int mlt_playlist_remove( mlt_playlist this, int where );
-extern int mlt_playlist_move( mlt_playlist this, int from, int to );
-extern int mlt_playlist_resize_clip( mlt_playlist this, int clip, mlt_position in, mlt_position out );
-extern void mlt_playlist_close( mlt_playlist this );
+extern mlt_producer mlt_playlist_producer( mlt_playlist self );
+extern mlt_service mlt_playlist_service( mlt_playlist self );
+extern mlt_properties mlt_playlist_properties( mlt_playlist self );
+extern int mlt_playlist_count( mlt_playlist self );
+extern int mlt_playlist_clear( mlt_playlist self );
+extern int mlt_playlist_append( mlt_playlist self, mlt_producer producer );
+extern int mlt_playlist_append_io( mlt_playlist self, mlt_producer producer, mlt_position in, mlt_position out );
+extern int mlt_playlist_blank( mlt_playlist self, mlt_position length );
+extern mlt_position mlt_playlist_clip( mlt_playlist self, mlt_whence whence, int index );
+extern int mlt_playlist_current_clip( mlt_playlist self );
+extern mlt_producer mlt_playlist_current( mlt_playlist self );
+extern int mlt_playlist_get_clip_info( mlt_playlist self, mlt_playlist_clip_info *info, int index );
+extern int mlt_playlist_insert( mlt_playlist self, mlt_producer producer, int where, mlt_position in, mlt_position out );
+extern int mlt_playlist_remove( mlt_playlist self, int where );
+extern int mlt_playlist_move( mlt_playlist self, int from, int to );
+extern int mlt_playlist_resize_clip( mlt_playlist self, int clip, mlt_position in, mlt_position out );
+extern int mlt_playlist_split( mlt_playlist self, int clip, mlt_position position );
+extern int mlt_playlist_join( mlt_playlist self, int clip, int count, int merge );
+extern int mlt_playlist_mix( mlt_playlist self, int clip, int length, mlt_transition transition );
+extern void mlt_playlist_close( mlt_playlist self );
 
 #endif