X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2B%2B%2Fsrc%2FMltPlaylist.h;h=ece8bede775bc01f0dd3ede86cdef9952fa3daa0;hb=c76ddcb7811f95802802d65d56adeaeab5af9a39;hp=e5aa9778c14335a7cc052f76a282ed1bf6ca07e5;hpb=b61d43804b15c0ddf8a3579cdcd2146105d9be26;p=melted

diff --git a/mlt++/src/MltPlaylist.h b/mlt++/src/MltPlaylist.h
index e5aa977..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
 	{
@@ -39,22 +40,22 @@ namespace Mlt
 			int clip;
 			Producer *producer;
 			Service *service;
-			mlt_position start;
+			int start;
 			char *resource;
-			mlt_position frame_in;
-			mlt_position frame_out;
-			mlt_position frame_count;
-			mlt_position length;
+			int frame_in;
+			int frame_out;
+			int frame_count;
+			int length;
 			float fps;
 	};
 
 	class Playlist : public Producer
 	{
 		private:
-			bool destroy;
 			mlt_playlist instance;
 		public:
 			Playlist( );
+			Playlist( Service &playlist );
 			Playlist( Playlist &playlist );
 			Playlist( mlt_playlist playlist );
 			virtual ~Playlist( );
@@ -62,16 +63,19 @@ namespace Mlt
 			mlt_producer get_producer( );
 			int count( );
 			int clear( );
-			int append( Producer &producer, mlt_position in = -1, mlt_position out = -1 );
-			int blank( mlt_position length );
-			mlt_position clip( mlt_whence whence, int index );
+			int append( Producer &producer, int in = -1, int out = -1 );
+			int blank( int length );
+			int clip( mlt_whence whence, int index );
 			int current_clip( );
 			Producer *current( );
 			ClipInfo *clip_info( int index );
-			int insert( Producer &producer, int where, mlt_position in = -1, mlt_position out = -1 );
+			int insert( Producer &producer, int where, int in = -1, int out = -1 );
 			int remove( int where );
 			int move( int from, int to );
-			int resize_clip( int clip, mlt_position in, mlt_position out );
+			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 );
 	};
 }