X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_playlist.h;h=a7dd3f28ef666d70ffaad7ade570172b39375324;hb=76f260e441303164d9680fad0b52537a965e61b9;hp=48b4a55a35f8f98b2012108b8ce19044ebfbaf8b;hpb=80a5c8297b313b09add80814a637a71ba9e0fa05;p=melted

diff --git a/src/framework/mlt_playlist.h b/src/framework/mlt_playlist.h
index 48b4a55..a7dd3f2 100644
--- a/src/framework/mlt_playlist.h
+++ b/src/framework/mlt_playlist.h
@@ -28,14 +28,17 @@
 
 typedef struct
 {
+	int clip;
 	mlt_producer producer;
-	mlt_timecode start;
+	mlt_producer cut;
+	mlt_position start;
 	char *resource;
-	mlt_timecode in;
-	mlt_timecode out;
-	mlt_timecode playtime;
-	mlt_timecode length;
+	mlt_position frame_in;
+	mlt_position frame_out;
+	mlt_position frame_count;
+	mlt_position length;
 	float fps;
+	int repeat;
 }
 mlt_playlist_clip_info;
 
@@ -43,23 +46,30 @@ 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, double in, double out );
-extern int mlt_playlist_blank( mlt_playlist this, mlt_timecode length );
-extern mlt_timecode 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_timecode in, mlt_timecode 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_timecode in, mlt_timecode 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_repeat_clip( mlt_playlist self, int clip, int repeat );
+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 int mlt_playlist_mix_add( mlt_playlist self, int clip, mlt_transition transition );
+extern mlt_producer mlt_playlist_get_clip( mlt_playlist self, int clip );
+extern int mlt_playlist_clip_is_mix( mlt_playlist self, int clip );
+extern void mlt_playlist_close( mlt_playlist self );
 
 #endif