Merge ../mlt

[melted] / mlt++ / src / MltFrame.h

diff --git a/mlt++/src/MltFrame.h b/mlt++/src/MltFrame.h
index c5cd502..9d564ab 100644 (file)
--- a/mlt++/src/MltFrame.h
+++ b/mlt++/src/MltFrame.h
@@ -21,17 +21,19 @@
 #ifndef _MLTPP_FRAME_H_
 #define _MLTPP_FRAME_H_
 
+#include "config.h"
+
 #include <framework/mlt.h>
 #include "MltProperties.h"
 
 namespace Mlt
 {
        class Properties;
+       class Producer;
 
-       class Frame : public Properties
+       class MLTPP_DECLSPEC Frame : public Properties
        {
                private:
-                       bool destroy;
                        mlt_frame instance;
                public:
                        Frame( mlt_frame frame );
@@ -42,6 +44,8 @@ namespace Mlt
                        uint8_t *get_image( mlt_image_format &format, int &w, int &h, int writable = 0 );
                        unsigned char *fetch_image( mlt_image_format format, int w, int h, int writable = 0 );
                        int16_t *get_audio( mlt_audio_format &format, int &frequency, int &channels, int &samples );
+                       unsigned char *get_waveform( int w, int h );
+                       Producer *get_original_producer( );
        };
 }