Merge ../mlt++

[mlt] / mlt++ / src / MltPlaylist.h

diff --git a/mlt++/src/MltPlaylist.h b/mlt++/src/MltPlaylist.h
index 75a36671443e40cebfc4eca492b9389f5e61905b..0cd17b0859b68c21fb55593cc3b863d16f1f8c2b 100644 (file)
--- a/mlt++/src/MltPlaylist.h
+++ b/mlt++/src/MltPlaylist.h
@@ -21,6 +21,8 @@
 #ifndef _MLTPP_PLAYLIST_H_
 #define _MLTPP_PLAYLIST_H_
 
+#include "config.h"
+
 #include <framework/mlt.h>
 
 #include "MltProducer.h"
@@ -32,7 +34,7 @@ namespace Mlt
        class Playlist;
        class Transition;
 
-       class ClipInfo
+       class MLTPP_DECLSPEC ClipInfo
        {
                public:
                        ClipInfo( );
@@ -52,7 +54,7 @@ namespace Mlt
                        int repeat;
        };
 
-       class Playlist : public Producer
+       class MLTPP_DECLSPEC Playlist : public Producer
        {
                private:
                        mlt_playlist instance;
@@ -72,11 +74,13 @@ namespace Mlt
                        int current_clip( );
                        Producer *current( );
                        ClipInfo *clip_info( int index, ClipInfo *info = NULL );
+                       static void delete_clip_info( ClipInfo *info );
                        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, int in, int out );
                        int split( int clip, int position );
+                       int split_at( int position, bool left = true );
                        int join( int clip, int count = 1, int merge = 1 );
                        int mix( int clip, int length, Transition *transition = NULL );
                        int mix_add( int clip, Transition *transition );
@@ -86,6 +90,7 @@ namespace Mlt
                        int get_clip_index_at( int position );
                        bool is_mix( int clip );
                        bool is_blank( int clip );
+                       bool is_blank_at( int position );
                        void consolidate_blanks( int keep_length = 0 );
                        Producer *replace_with_blank( int clip );
                        void insert_blank( int clip, int length );