mlt_service.c: fix bad identification for some services (eg. transitions)

[melted] / src / framework / mlt_service.c

diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c
index d120d28..9201865 100644 (file)
--- a/src/framework/mlt_service.c
+++ b/src/framework/mlt_service.c
@@ -3,22 +3,21 @@
  * 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"
 #include "mlt_service.h"
 #include "mlt_filter.h"
 #include "mlt_frame.h"
@@ -124,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;
@@ -304,7 +301,7 @@ static int service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
                if ( producer != NULL )
                        return mlt_service_get_frame( producer, frame, index );
        }
-       *frame = mlt_frame_init( );
+       *frame = mlt_frame_init( this );
        return 0;
 }
 
@@ -389,7 +386,7 @@ int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
 
        // Make sure we return a frame
        if ( *frame == NULL )
-               *frame = mlt_frame_init( );
+               *frame = mlt_frame_init( this );
 
        // Unlock the service
        mlt_service_unlock( this );
@@ -489,6 +486,14 @@ mlt_filter mlt_service_filter( mlt_service this, int index )
        return filter;
 }
 
+/** Retrieve the profile.
+*/
+
+mlt_profile mlt_service_profile( mlt_service this )
+{
+       return mlt_properties_get_data( MLT_SERVICE_PROPERTIES( this ), "_profile", NULL );
+}
+
 /** Close the service.
 */