Applied patch from Stephane Fillod to make configure run with bash

[melted] / src / framework / mlt_service.h

diff --git a/src/framework/mlt_service.h b/src/framework/mlt_service.h
index 4fa7c4a..5ea328c 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;
 };
@@ -44,7 +44,11 @@ struct mlt_service_s
 /** The public API.
 */
 
+#define MLT_SERVICE_PROPERTIES( service )      ( &( service )->parent )
+
 extern int mlt_service_init( mlt_service self, void *child );
+extern void mlt_service_lock( mlt_service self );
+extern void mlt_service_unlock( mlt_service self );
 extern mlt_service_type mlt_service_identify( mlt_service self );
 extern int mlt_service_connect_producer( mlt_service self, mlt_service producer, int index );
 extern int mlt_service_get_frame( mlt_service self, mlt_frame_ptr frame, int index );
@@ -58,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