[Mlt-devel] mlt/src/framework mlt_consumer.h, 1.16, 1.17 mlt_filter.h, 1.9, 1.10 mlt_frame.h, 1.31,
Brought to you by:
ddennedy,
lilo_booter
Menu
▾
▴
[Mlt-devel] mlt/src/framework mlt_consumer.h, 1.16, 1.17 mlt_filter.h, 1.9, 1.10 mlt_frame.h, 1.31, 1.32 mlt_geometry.h, 1.3, 1.4 mlt_multitrack.h, 1.7, 1.8 mlt_producer.h, 1.14, 1.15 mlt_service.h, 1.14, 1.15 mlt_transition.h, 1.9, 1.10
Update of /cvsroot/mlt/mlt/src/framework In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv8294/src/framework Modified Files: mlt_consumer.h mlt_filter.h mlt_frame.h mlt_geometry.h mlt_multitrack.h mlt_producer.h mlt_service.h mlt_transition.h Log Message: Applied patch from Stephane Fillod to make configure run with bash since it uses bash-specific features. Also, patches headers to comments for pedantic compilation. Index: mlt_filter.h =================================================================== RCS file: /cvsroot/mlt/mlt/src/framework/mlt_filter.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- mlt_filter.h 1 Dec 2004 13:37:06 -0000 1.9 +++ mlt_filter.h 8 Dec 2006 04:58:52 -0000 1.10 @@ -28,16 +28,16 @@ struct mlt_filter_s { - // We're implementing service here + /* We're implementing service here */ struct mlt_service_s parent; - // public virtual + /* public virtual */ void ( *close )( mlt_filter ); - // protected filter method + /* protected filter method */ mlt_frame ( *process )( mlt_filter, mlt_frame ); - // Protected + /* Protected */ void *child; }; Index: mlt_service.h =================================================================== RCS file: /cvsroot/mlt/mlt/src/framework/mlt_service.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- mlt_service.h 1 Dec 2004 13:37:06 -0000 1.14 +++ mlt_service.h 8 Dec 2006 04:58:52 -0000 1.15 @@ -28,15 +28,15 @@ struct mlt_service_s { - // We're extending properties here + /* We're extending properties here */ struct mlt_properties_s parent; - // Protected virtual + /* Protected virtual */ int ( *get_frame )( mlt_service self, mlt_frame_ptr frame, int index ); mlt_destructor close; void *close_object; - // Private data + /* Private data */ void *local; void *child; }; @@ -62,7 +62,7 @@ extern void mlt_service_close( mlt_service self ); -// I'm not sure about self one - leaving it out of docs for now (only used in consumer_westley) +/* I'm not sure about self one - leaving it out of docs for now (only used in consumer_westley) */ extern mlt_service mlt_service_get_producer( mlt_service self ); #endif Index: mlt_frame.h =================================================================== RCS file: /cvsroot/mlt/mlt/src/framework/mlt_frame.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- mlt_frame.h 22 May 2006 00:59:48 -0000 1.31 +++ mlt_frame.h 8 Dec 2006 04:58:52 -0000 1.32 @@ -29,13 +29,13 @@ struct mlt_frame_s { - // We're extending properties here + /* We're extending properties here */ struct mlt_properties_s parent; - // Virtual methods + /* Virtual methods */ uint8_t * ( *get_alpha_mask )( mlt_frame self ); - // Private properties + /* Private properties */ mlt_deque stack_image; mlt_deque stack_audio; mlt_deque stack_service; Index: mlt_geometry.h =================================================================== RCS file: /cvsroot/mlt/mlt/src/framework/mlt_geometry.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mlt_geometry.h 3 Jan 2005 20:13:30 -0000 1.3 +++ mlt_geometry.h 8 Dec 2006 04:58:52 -0000 1.4 @@ -25,15 +25,15 @@ struct mlt_geometry_item_s { - // Will be 1 when this is a key frame + /* Will be 1 when this is a key frame */ int key; - // The actual frame this corresponds to + /* The actual frame this corresponds to */ int frame; - // Distort + /* Distort */ int distort; - // x,y are upper left + /* x,y are upper left */ float x, y, w, h, mix; - // Indicates which values are fixed + /* Indicates which values are fixed */ int f[ 5 ]; }; @@ -42,31 +42,31 @@ void *local; }; -// Create a new geometry structure +/* Create a new geometry structure */ extern mlt_geometry mlt_geometry_init( ); -// Parse the geometry specification for a given length and normalised width/height (-1 for default) +/* Parse the geometry specification for a given length and normalised width/height (-1 for default) */ extern int mlt_geometry_parse( mlt_geometry self, char *data, int length, int nw, int nh ); -// Conditionally refresh the geometry if it's modified +/* Conditionally refresh the geometry if it's modified */ extern int mlt_geometry_refresh( mlt_geometry self, char *data, int length, int nw, int nh ); -// Get and set the length +/* Get and set the length */ extern int mlt_geometry_get_length( mlt_geometry self ); extern void mlt_geometry_set_length( mlt_geometry self, int length ); -// Parse an item - doesn't affect the geometry itself but uses current information for evaluation -// (item->frame should be specified if not included in the data itself) +/* Parse an item - doesn't affect the geometry itself but uses current information for evaluation */ +/* (item->frame should be specified if not included in the data itself) */ extern int mlt_geometry_parse_item( mlt_geometry self, mlt_geometry_item item, char *data ); -// Fetch a geometry item for an absolute position +/* Fetch a geometry item for an absolute position */ extern int mlt_geometry_fetch( mlt_geometry self, mlt_geometry_item item, float position ); -// Specify a geometry item at an absolute position +/* Specify a geometry item at an absolute position */ extern int mlt_geometry_insert( mlt_geometry self, mlt_geometry_item item ); -// Remove the key at the specified position +/* Remove the key at the specified position */ extern int mlt_geometry_remove( mlt_geometry self, int position ); -// Get the key at the position or the next following +/* Get the key at the position or the next following */ extern int mlt_geometry_next_key( mlt_geometry self, mlt_geometry_item item, int position ); extern int mlt_geometry_prev_key( mlt_geometry self, mlt_geometry_item item, int position ); -// Serialise the current geometry +/* Serialise the current geometry */ extern char *mlt_geometry_serialise_cut( mlt_geometry self, int in, int out ); extern char *mlt_geometry_serialise( mlt_geometry self ); -// Close the geometry +/* Close the geometry */ extern void mlt_geometry_close( mlt_geometry self ); #endif Index: mlt_multitrack.h =================================================================== RCS file: /cvsroot/mlt/mlt/src/framework/mlt_multitrack.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- mlt_multitrack.h 1 Dec 2004 13:37:06 -0000 1.7 +++ mlt_multitrack.h 8 Dec 2006 04:58:52 -0000 1.8 @@ -36,7 +36,7 @@ struct mlt_multitrack_s { - // We're extending producer here + /* We're extending producer here */ struct mlt_producer_s parent; mlt_track *list; int size; Index: mlt_consumer.h =================================================================== RCS file: /cvsroot/mlt/mlt/src/framework/mlt_consumer.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- mlt_consumer.h 21 Jun 2005 20:59:37 -0000 1.16 +++ mlt_consumer.h 8 Dec 2006 04:58:52 -0000 1.17 @@ -29,16 +29,16 @@ struct mlt_consumer_s { - // We're implementing service here + /* We're implementing service here */ struct mlt_service_s parent; - // public virtual + /* public virtual */ int ( *start )( mlt_consumer ); int ( *stop )( mlt_consumer ); int ( *is_stopped )( mlt_consumer ); void ( *close )( mlt_consumer ); - // Private data + /* Private data */ void *local; void *child; Index: mlt_producer.h =================================================================== RCS file: /cvsroot/mlt/mlt/src/framework/mlt_producer.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- mlt_producer.h 1 Dec 2004 13:37:06 -0000 1.14 +++ mlt_producer.h 8 Dec 2006 04:58:52 -0000 1.15 @@ -29,15 +29,15 @@ struct mlt_producer_s { - // We're implementing service here + /* We're implementing service here */ struct mlt_service_s parent; - // Public virtual methods + /* Public virtual methods */ int ( *get_frame )( mlt_producer, mlt_frame_ptr, int ); mlt_destructor close; void *close_object; - // Private data + /* Private data */ void *local; void *child; }; Index: mlt_transition.h =================================================================== RCS file: /cvsroot/mlt/mlt/src/framework/mlt_transition.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- mlt_transition.h 25 Jan 2005 12:31:08 -0000 1.9 +++ mlt_transition.h 8 Dec 2006 04:58:52 -0000 1.10 @@ -28,22 +28,22 @@ struct mlt_transition_s { - // We're implementing service here + /* We're implementing service here */ struct mlt_service_s parent; - // public virtual + /* public virtual */ void ( *close )( mlt_transition ); - // protected transition method + /* protected transition method */ mlt_frame ( *process )( mlt_transition, mlt_frame, mlt_frame ); - // Protected + /* Protected */ void *child; - // track and in/out points + /* track and in/out points */ mlt_service producer; - // Private + /* Private */ mlt_frame *frames; int held; }; |