X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2B%2B%2Fsrc%2FMltFrame.h;h=030ae0d979600f16ea823b607c4d803957b799c6;hb=3e2991e189a71045210d8c97458c452d6c2f02da;hp=0b057a5d7c77528ae3064b1e32289208632f9fcc;hpb=01c1d44e8df201c3061cf20addf5421d21d8bcb0;p=melted

diff --git a/mlt++/src/MltFrame.h b/mlt++/src/MltFrame.h
index 0b057a5..030ae0d 100644
--- a/mlt++/src/MltFrame.h
+++ b/mlt++/src/MltFrame.h
@@ -26,25 +26,24 @@
 
 namespace Mlt
 {
+	class Properties;
+	class Producer;
+
 	class Frame : public Properties
 	{
+		private:
+			mlt_frame instance;
 		public:
-			virtual mlt_frame get_frame( ) = 0;
+			Frame( mlt_frame frame );
+			Frame( Frame &frame );
+			virtual ~Frame( );
+			virtual mlt_frame get_frame( );
 			mlt_properties get_properties( );
 			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 );
-	};
-	
-	class FrameInstance : public Frame
-	{
-		private:
-			bool destroy;
-			mlt_frame instance;
-		public:
-			mlt_frame get_frame( );
-			FrameInstance( mlt_frame frame );
-			FrameInstance( Frame &frame );
-			virtual ~FrameInstance( );
+			unsigned char *get_waveform( int w, int h );
+			Producer *get_original_producer( );
 	};
 }