Swig mods

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@336 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
index edea67eaa2f499280666a1e1e5c131efc649cebb..cfdc4ac9aae6b24fb76a33d098949bbdcc0f2d40 100644 (file)
--- a/src/framework/mlt_consumer.c
+++ b/src/framework/mlt_consumer.c
@@ -156,9 +156,6 @@ int mlt_consumer_start( mlt_consumer this )
                                mlt_properties_set_data( properties, "test_card_producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL );
                        }
 
-                       // Check and run an ante command
-                       if ( mlt_properties_get( properties, "ante" ) )
-                               system( mlt_properties_get( properties, "ante" ) );
                }
        }
        else
@@ -167,6 +164,10 @@ int mlt_consumer_start( mlt_consumer this )
                mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
        }
 
+       // Check and run an ante command
+       if ( mlt_properties_get( properties, "ante" ) )
+               system( mlt_properties_get( properties, "ante" ) );
+
        // Set the real_time preference
        this->real_time = mlt_properties_get_int( properties, "real_time" );
 

diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c
index 3ebf0ad82e41988dd076f8d300aa8ce22f4674fe..dcd0742fef7c14728da16616f6596e367205f177 100644 (file)
--- a/src/framework/mlt_service.c
+++ b/src/framework/mlt_service.c
@@ -188,6 +188,14 @@ static int service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
        return 0;
 }
 
+/** Return the properties object.
+*/
+
+mlt_properties mlt_service_properties( mlt_service self )
+{
+       return &self->parent;
+}
+
 /** Obtain a frame.
 */
 

diff --git a/src/framework/mlt_service.h b/src/framework/mlt_service.h
index df62b43bdea3f7948918b9ea71b54e20e9d8255c..98ef43a706718e3cd574c4a1ba4eb3931126858a 100644 (file)
--- a/src/framework/mlt_service.h
+++ b/src/framework/mlt_service.h
@@ -45,18 +45,11 @@ struct mlt_service_s
 extern int mlt_service_init( mlt_service self, void *child );
 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 );
+extern mlt_properties mlt_service_properties( mlt_service self );
 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)
 extern mlt_service mlt_service_get_producer( mlt_service self );
 
-/** Return the properties object.
-*/
-
-static inline mlt_properties mlt_service_properties( mlt_service self )
-{
-       return &self->parent;
-}
-
 #endif
 

diff --git a/src/modules/xine/Makefile b/src/modules/xine/Makefile
index 67b441c8020e0379a12a1f959e955c8f709101fc..572ba4c0da4adcfc27e90e7a1ed8c042b57b4737 100644 (file)
--- a/src/modules/xine/Makefile
+++ b/src/modules/xine/Makefile
@@ -9,6 +9,8 @@ OBJS = factory.o \
 
 CFLAGS += -I../../ -DARCH_X86
 
+LDFLAGS+=-L../../framework -lmlt
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)