producer_framebuffer.c: a little cleanup from last commit

[melted] / src / framework / mlt_service.c

diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c
index 4c97886..04d929a 100644 (file)
--- a/src/framework/mlt_service.c
+++ b/src/framework/mlt_service.c
@@ -123,13 +123,11 @@ mlt_service_type mlt_service_identify( mlt_service this )
                char *resource = mlt_properties_get( properties, "resource" );
                if ( mlt_type == NULL )
                        type = unknown_type;
-               else if ( resource == NULL || !strcmp( resource, "<producer>" ) )
-                       type = producer_type;
-               else if ( !strcmp( resource, "<playlist>" ) )
+               else if (resource != NULL && !strcmp( resource, "<playlist>" ) )
                        type = playlist_type;
-               else if ( !strcmp( resource, "<tractor>" ) )
+               else if (resource != NULL && !strcmp( resource, "<tractor>" ) )
                        type = tractor_type;
-               else if ( !strcmp( resource, "<multitrack>" ) )
+               else if (resource != NULL && !strcmp( resource, "<multitrack>" ) )
                        type = multitrack_type;
                else if ( !strcmp( mlt_type, "producer" ) )
                        type = producer_type;
@@ -190,11 +188,7 @@ int mlt_service_connect_producer( mlt_service this, mlt_service producer, int in
 
                // Increment the reference count on this producer
                if ( producer != NULL )
-               {
-                       mlt_service_lock( producer );
                        mlt_properties_inc_ref( MLT_SERVICE_PROPERTIES( producer ) );
-                       mlt_service_unlock( producer );
-               }
 
                // Now we disconnect the producer service from its consumer
                mlt_service_disconnect( producer );
@@ -501,10 +495,8 @@ mlt_profile mlt_service_profile( mlt_service this )
 
 void mlt_service_close( mlt_service this )
 {
-       mlt_service_lock( this );
        if ( this != NULL && mlt_properties_dec_ref( MLT_SERVICE_PROPERTIES( this ) ) <= 0 )
        {
-               mlt_service_unlock( this );
                if ( this->close != NULL )
                {
                        this->close( this->close_object );