From a2c29b04aabe82b14851b905fca993f9f471bc6b Mon Sep 17 00:00:00 2001 From: ddennedy Date: Fri, 8 Dec 2006 04:58:52 +0000 Subject: [PATCH] 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. git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@941 d19143bc-622f-0410-bfdd-b5b2a6649095 --- ChangeLog | 5 +++++ configure | 2 +- src/framework/mlt_consumer.h | 6 +++--- src/framework/mlt_filter.h | 8 ++++---- src/framework/mlt_frame.h | 6 +++--- src/framework/mlt_geometry.h | 34 +++++++++++++++++----------------- src/framework/mlt_multitrack.h | 2 +- src/framework/mlt_producer.h | 6 +++--- src/framework/mlt_service.h | 8 ++++---- src/framework/mlt_transition.h | 12 ++++++------ 10 files changed, 47 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0364a22..4e3830f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-12-07 Dan Dennedy applied audio frequency and audio channels initialization patch from Jean-Baptiste diff --git a/configure b/configure index 2474216..752e983 100755 --- a/configure +++ b/configure @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash function show_help { diff --git a/src/framework/mlt_consumer.h b/src/framework/mlt_consumer.h index 82a08b4..03d2657 100644 --- a/src/framework/mlt_consumer.h +++ b/src/framework/mlt_consumer.h @@ -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; diff --git a/src/framework/mlt_filter.h b/src/framework/mlt_filter.h index d95a754..5f029f0 100644 --- a/src/framework/mlt_filter.h +++ b/src/framework/mlt_filter.h @@ -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; }; diff --git a/src/framework/mlt_frame.h b/src/framework/mlt_frame.h index da61da1..807c600 100644 --- a/src/framework/mlt_frame.h +++ b/src/framework/mlt_frame.h @@ -29,13 +29,13 @@ typedef int ( *mlt_get_audio )( mlt_frame self, int16_t **buffer, mlt_audio_form 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; diff --git a/src/framework/mlt_geometry.h b/src/framework/mlt_geometry.h index 41cd013..1261902 100644 --- a/src/framework/mlt_geometry.h +++ b/src/framework/mlt_geometry.h @@ -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 @@ struct mlt_geometry_s 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 diff --git a/src/framework/mlt_multitrack.h b/src/framework/mlt_multitrack.h index f0eaa70..473ee2c 100644 --- a/src/framework/mlt_multitrack.h +++ b/src/framework/mlt_multitrack.h @@ -36,7 +36,7 @@ typedef struct mlt_track_s *mlt_track; struct mlt_multitrack_s { - // We're extending producer here + /* We're extending producer here */ struct mlt_producer_s parent; mlt_track *list; int size; diff --git a/src/framework/mlt_producer.h b/src/framework/mlt_producer.h index c2a4736..1c5bd15 100644 --- a/src/framework/mlt_producer.h +++ b/src/framework/mlt_producer.h @@ -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; }; diff --git a/src/framework/mlt_service.h b/src/framework/mlt_service.h index 0d4e561..5ea328c 100644 --- a/src/framework/mlt_service.h +++ b/src/framework/mlt_service.h @@ -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 mlt_filter mlt_service_filter( mlt_service self, int index ); 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 diff --git a/src/framework/mlt_transition.h b/src/framework/mlt_transition.h index 9db26b3..a6222ce 100644 --- a/src/framework/mlt_transition.h +++ b/src/framework/mlt_transition.h @@ -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; }; -- 1.7.4.4