change property 'consumer' to 'mlt_service' consistent with xml

diff --git a/src/melt/melt.c b/src/melt/melt.c
index 8298266040e5677de7e3a94e86f17238c552f2b7..3f868549797008df873165923ee78700c4e143d5 100644 (file)
--- a/src/melt/melt.c
+++ b/src/melt/melt.c
@@ -286,7 +286,7 @@ static void load_consumer( mlt_consumer *consumer, mlt_profile profile, int argc
                                snprintf( key, sizeof(key), "%d", k++ );
                                mlt_properties_set_data( properties, key, new_props, 0,
                                        (mlt_destructor) mlt_properties_close, NULL );
-                               mlt_properties_set( new_props, "consumer", argv[ ++i ] );
+                               mlt_properties_set( new_props, "mlt_service", argv[ ++i ] );
                                while ( argv[ i + 1 ] != NULL && strstr( argv[ i + 1 ], "=" ) )
                                        mlt_properties_parse( new_props, argv[ ++ i ] );
                                mlt_properties_dump( new_props, stderr );

diff --git a/src/modules/core/consumer_multi.c b/src/modules/core/consumer_multi.c
index 7b5cc707e1d2e7690bfde912857c6c163af85c43..b157e7f767403e24a68c4f7fb53ecb6db6476970 100644 (file)
--- a/src/modules/core/consumer_multi.c
+++ b/src/modules/core/consumer_multi.c
@@ -133,7 +133,7 @@ static mlt_consumer generate_consumer( mlt_consumer consumer, mlt_properties pro
                profile = mlt_profile_init( mlt_properties_get( props, "mlt_profile" ) );
        if ( !profile )
                profile = mlt_profile_clone( mlt_service_profile( MLT_CONSUMER_SERVICE(consumer) ) );
-       mlt_consumer nested = create_consumer( profile, mlt_properties_get( props, "consumer" ) );
+       mlt_consumer nested = create_consumer( profile, mlt_properties_get( props, "mlt_service" ) );
 
        if ( nested )
        {
@@ -215,7 +215,7 @@ static void foreach_consumer_init( mlt_consumer consumer )
                                int i, count;
 
                                if ( !p ) break;
-                               mlt_properties_set( p, "consumer", mlt_properties_get( properties, key ) );
+                               mlt_properties_set( p, "mlt_service", mlt_properties_get( properties, key ) );
                                snprintf( key, sizeof(key), "%d.", index );
 
                                count = mlt_properties_count( properties );