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

diff --git a/ChangeLog b/ChangeLog
index 0364a225f1065ce8f03171c03109c06766762d7c..4e3830fcfff95a65d85d0529d2661faa5d3f236b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-07 Dan Dennedy <dan@dennedy.org
+       Applied patch from Stephane Fillod to make configure run with bash
+       since it uses bash-specific features. Also, patches headers to 
+       C comments for pedantic compilation.
+
 2006-09-28 Zachary Drew <zachary.drew@gmail.com>
        applied audio frequency and audio channels initialization patch from Jean-Baptiste
 

diff --git a/configure b/configure
index 2474216d9718e023c5073ebfc161f71ab1f81292..752e983615059d36aa238e234686a79274692ad1 100755 (executable)
--- 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 82a08b42ce08e7b2805eb55340465272a13ceb7d..03d265797057e49eb6f5e8ed45e0d2ddca79ba9b 100644 (file)
--- 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 d95a754c534cfc4522d4a25c637958ce38685bd4..5f029f0de82ecc1f99fda836a2fe032598cb8f72 100644 (file)
--- 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 da61da10e7881c9e5fb77353514bf6c428e56be6..807c600c29572e7e75e047c0fa9039ebd2e85819 100644 (file)
--- 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 41cd0132edd76fdae0bd502fe04b249b5c23a187..12619026a75098fea6beaa7927fde968bf74ffde 100644 (file)
--- 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 f0eaa70eccb846a8ddefdecda73d786b15935832..473ee2c1c3b6ba5af30d6a4f6c25f1bcdd2c1227 100644 (file)
--- 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 c2a473610bc678d54be882eefb35c1aa56a732e6..1c5bd15d575fa526dd5e84f90e21ff7b125e4f38 100644 (file)
--- 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 0d4e56119d5b54c327c28f9e5df05d56c99292db..5ea328c031a2e3db7313739c5970670d968bbff9 100644 (file)
--- 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 9db26b3b91452a801fcd3a5f2bbcca74143bba16..a6222ce83ae180cdd83473b11463dc48830849c5 100644 (file)
--- 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;
 };