X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.h;h=e288c1b5ac39296606dc08ed219510ddc3d91a35;hb=2a800ec4c840132c7a629b764b673dce09771637;hp=a35086ed8db004f6e385b8e03b2adf41b3995427;hpb=6820dfa615e2f55eb4ef17327c2cd293605c3389;p=melted

diff --git a/src/framework/mlt_frame.h b/src/framework/mlt_frame.h
index a35086e..e288c1b 100644
--- a/src/framework/mlt_frame.h
+++ b/src/framework/mlt_frame.h
@@ -24,30 +24,6 @@
 #include "mlt_properties.h"
 #include "mlt_deque.h"
 
-typedef enum
-{
-	mlt_image_none = 0,
-	mlt_image_rgb24,
-	mlt_image_rgb24a,
-	mlt_image_yuv422,
-	mlt_image_yuv420p
-}
-mlt_image_format;
-
-typedef enum
-{
-	mlt_video_standard_pal = 0,
-	mlt_video_standard_ntsc
-}
-mlt_video_standard;
-
-typedef enum
-{
-	mlt_audio_none = 0,
-	mlt_audio_pcm
-}
-mlt_audio_format;
-
 typedef int ( *mlt_get_image )( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable );
 
 struct mlt_frame_s
@@ -60,9 +36,8 @@ struct mlt_frame_s
 	uint8_t * ( *get_alpha_mask )( mlt_frame this );
 	
 	// Private properties
-	mlt_deque stack_get_image;
-	mlt_deque stack_frame;
-	mlt_deque stack_service;
+	mlt_deque stack_image;
+	mlt_deque stack_audio;
 };
 
 extern mlt_frame mlt_frame_init( );
@@ -73,17 +48,17 @@ extern double mlt_frame_get_aspect_ratio( mlt_frame this );
 extern int mlt_frame_set_aspect_ratio( mlt_frame this, double value );
 extern mlt_position mlt_frame_get_position( mlt_frame this );
 extern int mlt_frame_set_position( mlt_frame this, mlt_position value );
-
 extern int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable );
 extern uint8_t *mlt_frame_get_alpha_mask( mlt_frame this );
 extern int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples );
-
 extern int mlt_frame_push_get_image( mlt_frame this, mlt_get_image get_image );
 extern mlt_get_image mlt_frame_pop_get_image( mlt_frame this );
 extern int mlt_frame_push_frame( mlt_frame this, mlt_frame that );
 extern mlt_frame mlt_frame_pop_frame( mlt_frame this );
 extern int mlt_frame_push_service( mlt_frame this, void *that );
 extern void *mlt_frame_pop_service( mlt_frame this );
+extern int mlt_frame_push_audio( mlt_frame this, void *that );
+extern void *mlt_frame_pop_audio( mlt_frame this );
 extern void mlt_frame_close( mlt_frame this );
 
 /* convenience functions */