Merge remote-tracking branch 'original/master'

[mlt] / src / modules / jackrack / filter_jackrack.c

diff --git a/src/modules/jackrack/filter_jackrack.c b/src/modules/jackrack/filter_jackrack.c
index f9e1b76e1a2372cf31783cad786187c66a8d16d6..c15d31e82db81f7d892a2a3d98adf0505215a767 100644 (file)
--- a/src/modules/jackrack/filter_jackrack.c
+++ b/src/modules/jackrack/filter_jackrack.c
@@ -32,6 +32,8 @@
 
 #include "jack_rack.h"
 
+extern pthread_mutex_t g_activate_mutex;
+
 #define BUFFER_LEN 204800 * 6
 
 static void jack_started_transmitter( mlt_listener listener, mlt_properties owner, mlt_service service, void **args )
@@ -59,7 +61,7 @@ static int jack_sync( jack_transport_state_t state, jack_position_t *jack_pos, v
        mlt_position position = mlt_profile_fps( profile ) * jack_pos->frame / jack_pos->frame_rate + 0.5;
        int result = 1;
 
-       mlt_log_verbose( MLT_FILTER_SERVICE(filter), "%s frame %u rate %u pos %d last_pos %d\n",
+       mlt_log_debug( MLT_FILTER_SERVICE(filter), "%s frame %u rate %u pos %d last_pos %d\n",
                JACKSTATE(state), jack_pos->frame, jack_pos->frame_rate, position,
                mlt_properties_get_position( properties, "_last_pos" ) );
        if ( state == JackTransportStopped )
@@ -173,7 +175,9 @@ static void initialise_jack_ports( mlt_properties properties )
                sizeof( float *) * channels, mlt_pool_release, NULL );
 
        // Start Jack processing - required before registering ports
+       pthread_mutex_lock( &g_activate_mutex );
        jack_activate( jack_client );
+       pthread_mutex_unlock( &g_activate_mutex  );
        
        // Register Jack ports
        for ( i = 0; i < channels; i++ )
@@ -300,6 +304,18 @@ static int jack_process (jack_nframes_t frames, void * data)
                }
        }
 
+       // Often jackd does not send the stopped event through the JackSyncCallback
+       jack_client_t *jack_client = mlt_properties_get_data( properties, "jack_client", NULL );
+       jack_position_t jack_pos;
+       jack_transport_state_t state = jack_transport_query( jack_client, &jack_pos );
+       int transport_state = mlt_properties_get_int( properties, "_transport_state" );
+       if ( state != transport_state )
+       {
+               mlt_properties_set_int( properties, "_transport_state", state );
+               if ( state == JackTransportStopped )
+                       jack_sync( state, &jack_pos, filter );
+       }
+
        return err;
 }
 
@@ -415,12 +431,20 @@ mlt_filter filter_jackrack_init( mlt_profile profile, mlt_service_type type, con
        mlt_filter this = mlt_filter_new( );
        if ( this != NULL )
        {
-               char name[14];
-               
+               char name[16];
+               char *jack_client_name;
+               jack_status_t status = 0;
+
                snprintf( name, sizeof( name ), "mlt%d", getpid() );
-               jack_client_t *jack_client = jack_client_open( name, JackNullOption, NULL );
+               jack_client_t *jack_client = jack_client_open( name, JackNullOption, &status, NULL );
                if ( jack_client )
                {
+                       if ( status & JackNameNotUnique ) 
+                       {
+                               jack_client_name = jack_get_client_name ( jack_client );
+                               strcpy( name, jack_client_name );
+                       }
+
                        mlt_properties properties = MLT_FILTER_PROPERTIES( this );
                        pthread_mutex_t *output_lock = mlt_pool_alloc( sizeof( pthread_mutex_t ) );
                        pthread_cond_t  *output_ready = mlt_pool_alloc( sizeof( pthread_cond_t ) );
@@ -453,6 +477,12 @@ mlt_filter filter_jackrack_init( mlt_profile profile, mlt_service_type type, con
                        mlt_events_listen( properties, this, "jack-seek", (mlt_listener) on_jack_seek );
                        mlt_properties_set_position( properties, "_jack_seek", -1 );
                }
+               else
+               {
+                       mlt_log_error( NULL, "Failed to connect to JACK server\n" );
+                       mlt_filter_close( this );
+                       this = NULL;
+               }
        }
        return this;
 }