X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2B%2B%2Fsrc%2FMltFilter.cpp;h=ad79fcf063c7f558d54a798cf62f0297225b19c8;hb=c1dda4b336a041cef7ad422a9dffc4705c7128fa;hp=9fa043956a8b0ecdf5e34f42f6516b0068cfea7c;hpb=1a4cf7f5285d16d0530ea03c2b524be7c1aa5dbc;p=melted diff --git a/mlt++/src/MltFilter.cpp b/mlt++/src/MltFilter.cpp index 9fa0439..ad79fcf 100644 --- a/mlt++/src/MltFilter.cpp +++ b/mlt++/src/MltFilter.cpp @@ -21,15 +21,15 @@ #include #include #include "MltFilter.h" +#include "MltProfile.h" using namespace Mlt; -Filter::Filter( char *id, char *arg ) : - destroy( true ), +Filter::Filter( Profile& profile, char *id, char *arg ) : instance( NULL ) { if ( arg != NULL ) { - instance = mlt_factory_filter( id, arg ); + instance = mlt_factory_filter( profile.get_profile(), id, arg ); } else { @@ -38,32 +38,42 @@ Filter::Filter( char *id, char *arg ) : char *temp = strdup( id ); char *arg = strchr( temp, ':' ) + 1; *( arg - 1 ) = '\0'; - instance = mlt_factory_filter( temp, arg ); + instance = mlt_factory_filter( profile.get_profile(), temp, arg ); free( temp ); } else { - instance = mlt_factory_filter( id, NULL ); + instance = mlt_factory_filter( profile.get_profile(), id, NULL ); } } } +Filter::Filter( Service &filter ) : + instance( NULL ) +{ + if ( filter.type( ) == filter_type ) + { + instance = ( mlt_filter )filter.get_service( ); + inc_ref( ); + } +} + Filter::Filter( Filter &filter ) : - destroy( false ), + Mlt::Service( filter ), instance( filter.get_filter( ) ) { + inc_ref( ); } Filter::Filter( mlt_filter filter ) : - destroy( false ), instance( filter ) { + inc_ref( ); } Filter::~Filter( ) { - if ( destroy ) - mlt_filter_close( instance ); + mlt_filter_close( instance ); } mlt_filter Filter::get_filter( )