Fix reading binary files on Windows.

[mlt] / src / modules / core / consumer_null.c

diff --git a/src/modules/core/consumer_null.c b/src/modules/core/consumer_null.c
index d2abe19db8a1bcdf44e6aa79a0a86e51ee1ac448..deb56b297a5ffbbc975493f6ae2f49811836d6f7 100644 (file)
--- a/src/modules/core/consumer_null.c
+++ b/src/modules/core/consumer_null.c
@@ -3,25 +3,23 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-// Local header files
-#include "consumer_null.h"
-
 // mlt Header files
+#include <framework/mlt_consumer.h>
 #include <framework/mlt_frame.h>
 
 // System header files
@@ -40,10 +38,10 @@ static void consumer_close( mlt_consumer this );
 /** Initialise the dv consumer.
 */
 
-mlt_consumer consumer_null_init( char *arg )
+mlt_consumer consumer_null_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
        // Allocate the consumer
-       mlt_consumer this = mlt_consumer_new( );
+       mlt_consumer this = mlt_consumer_new( profile );
 
        // If memory allocated and initialises without error
        if ( this != NULL )
@@ -80,6 +78,7 @@ static int consumer_start( mlt_consumer this )
 
                // Set the running state
                mlt_properties_set_int( properties, "running", 1 );
+               mlt_properties_set_int( properties, "joined", 0 );
 
                // Create the thread
                pthread_create( thread, NULL, consumer_thread, this );
@@ -96,16 +95,18 @@ static int consumer_stop( mlt_consumer this )
        mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
 
        // Check that we're running
-       if ( mlt_properties_get_int( properties, "running" ) )
+       if ( !mlt_properties_get_int( properties, "joined" ) )
        {
                // Get the thread
                pthread_t *thread = mlt_properties_get_data( properties, "thread", NULL );
 
                // Stop the thread
                mlt_properties_set_int( properties, "running", 0 );
+               mlt_properties_set_int( properties, "joined", 1 );
 
                // Wait for termination
-               pthread_join( *thread, NULL );
+               if ( thread )
+                       pthread_join( *thread, NULL );
        }
 
        return 0;
@@ -132,15 +133,23 @@ static void *consumer_thread( void *arg )
        // Get the properties
        mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
 
+       // Convenience functionality
+       int terminate_on_pause = mlt_properties_get_int( properties, "terminate_on_pause" );
+       int terminated = 0;
+
        // Frame and size
        mlt_frame frame = NULL;
 
        // Loop while running
-       while( mlt_properties_get_int( properties, "running" ) )
+       while( !terminated && mlt_properties_get_int( properties, "running" ) )
        {
                // Get the frame
                frame = mlt_consumer_rt_frame( this );
 
+               // Check for termination
+               if ( terminate_on_pause && frame != NULL )
+                       terminated = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" ) == 0.0;
+
                // Check that we have a frame to work with
                if ( frame != NULL )
                {
@@ -151,6 +160,7 @@ static void *consumer_thread( void *arg )
        }
 
        // Indicate that the consumer is stopped
+       mlt_properties_set_int( properties, "running", 0 );
        mlt_consumer_stopped( this );
 
        return NULL;