Cleanup license declarations and remove dv1394d references.

[melted] / src / framework / mlt_service.c

diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c
index 4619780..aedc6ef 100644 (file)
--- a/src/framework/mlt_service.c
+++ b/src/framework/mlt_service.c
@@ -3,19 +3,19 @@
  * 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
  */
 
 #include "config.h"
@@ -338,7 +338,8 @@ void mlt_service_apply_filters( mlt_service this, mlt_frame frame, int index )
                        {
                                mlt_position in = mlt_filter_get_in( base->filters[ i ] );
                                mlt_position out = mlt_filter_get_out( base->filters[ i ] );
-                               if ( ( in == 0 && out == 0 ) || ( position >= in && ( position <= out || out == 0 ) ) )
+                               int disable = mlt_properties_get_int( MLT_FILTER_PROPERTIES( base->filters[ i ] ), "disable" );
+                               if ( !disable && ( ( in == 0 && out == 0 ) || ( position >= in && ( position <= out || out == 0 ) ) ) )
                                {
                                        mlt_properties_set_position( frame_properties, "in", in == 0 ? this_in : in );
                                        mlt_properties_set_position( frame_properties, "out", out == 0 ? this_out : out );
@@ -355,17 +356,26 @@ void mlt_service_apply_filters( mlt_service this, mlt_frame frame, int index )
 
 int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
 {
+       int result = 0;
+
+       // Lock the service
        mlt_service_lock( this );
+
+       // Ensure that the frame is NULL
+       *frame = NULL;
+
+       // Only process if we have a valid service
        if ( this != NULL && this->get_frame != NULL )
        {
-               int result = 0;
                mlt_properties properties = MLT_SERVICE_PROPERTIES( this );
                mlt_position in = mlt_properties_get_position( properties, "in" );
                mlt_position out = mlt_properties_get_position( properties, "out" );
-               mlt_properties_inc_ref( properties );
+
                result = this->get_frame( this, frame, index );
+
                if ( result == 0 )
                {
+                       mlt_properties_inc_ref( properties );
                        properties = MLT_FRAME_PROPERTIES( *frame );
                        if ( in >=0 && out > 0 )
                        {
@@ -374,18 +384,17 @@ int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
                        }
                        mlt_service_apply_filters( this, *frame, 1 );
                        mlt_deque_push_back( MLT_FRAME_SERVICE_STACK( *frame ), this );
-                       mlt_service_unlock( this );
                }
-               else
-               {
-                       mlt_service_unlock( this );
-                       mlt_service_close( this );
-               }
-               return result;
        }
+
+       // Make sure we return a frame
+       if ( *frame == NULL )
+               *frame = mlt_frame_init( );
+
+       // Unlock the service
        mlt_service_unlock( this );
-       *frame = mlt_frame_init( );
-       return 0;
+
+       return result;
 }
 
 static void mlt_service_filter_changed( mlt_service owner, mlt_service this )