X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_field.c;h=c988ae6ea4584933e1f337aa296c5e06cfd665ea;hb=f4963a6aa07644399b273b5d2b1f9299c9047414;hp=dfa15f4db7998debe4f44ab0ca9af7bee17e672c;hpb=fdff32bbd09ff13df3a3a12896690a4950b7d0d0;p=melted diff --git a/src/framework/mlt_field.c b/src/framework/mlt_field.c index dfa15f4..c988ae6 100644 --- a/src/framework/mlt_field.c +++ b/src/framework/mlt_field.c @@ -1,102 +1,173 @@ -/* - * mlt_field.c -- A field for planting multiple transitions and filters - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited - * Author: Charles Yates +/** + * \file mlt_field.c + * \brief a field for planting multiple transitions and filters + * \see mlt_field_s * - * 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. + * Copyright (C) 2003-2009 Ushodaya Enterprises Limited + * \author Charles Yates * - * This program is distributed in the hope that it will be useful, + * 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 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 "mlt_field.h" #include "mlt_service.h" #include "mlt_filter.h" #include "mlt_transition.h" +#include "mlt_multitrack.h" +#include "mlt_tractor.h" #include #include -/** Private structures. -*/ +/** \brief Field class + * + * The field is a convenience class that works with the tractor and multitrack classes to manage track filters and transitions. + */ struct mlt_field_s { - // We extending service here - struct mlt_service_s parent; - - // This is the producer we're connected to + /// This is the producer we're connected to mlt_service producer; + + /// Multitrack + mlt_multitrack multitrack; + + /// Tractor + mlt_tractor tractor; }; -/** Forward declarations -*/ +/** Construct a field, mulitrack, and tractor. + * + * \public \memberof mlt_field_s + * \return a new field + */ + +mlt_field mlt_field_init( ) +{ + // Initialise the field + mlt_field this = calloc( sizeof( struct mlt_field_s ), 1 ); + + // Initialise it + if ( this != NULL ) + { + // Construct a multitrack + this->multitrack = mlt_multitrack_init( ); -static int service_get_frame( mlt_service service, mlt_frame_ptr frame, int index ); + // Construct a tractor + this->tractor = mlt_tractor_init( ); -/** Constructor. This service needs to know its producer at construction. + // The first plant will be connected to the mulitrack + this->producer = MLT_MULTITRACK_SERVICE( this->multitrack ); - When the first filter or transition is planted, we connect it immediately to - the producer of the field, and all subsequent plants are then connected to the - previous plant. This immediate connection requires the producer prior to the first - plant. - - It's a kind of arbitrary decsion - we could generate a dummy service here and - then connect the dummy in the normal connect manner. Behaviour may change in the - future (say, constructing a dummy when producer service is NULL). However, the - current solution is quite clean, if slightly out of sync with the rest of the - mlt framework. -*/ + // Connect the tractor to the multitrack + mlt_tractor_connect( this->tractor, this->producer ); + } -mlt_field mlt_field_init( mlt_service producer ) + // Return this + return this; +} + +/** Construct a field and initialize with supplied multitrack and tractor. + * + * \public \memberof mlt_field_s + * \param multitrack a multitrack + * \param tractor a tractor + * \return a new field + */ + +mlt_field mlt_field_new( mlt_multitrack multitrack, mlt_tractor tractor ) { // Initialise the field mlt_field this = calloc( sizeof( struct mlt_field_s ), 1 ); - // Get the service - mlt_service service = &this->parent; + // Initialise it + if ( this != NULL ) + { + // Construct a multitrack + this->multitrack = multitrack; - // Initialise the service - mlt_service_init( service, this ); + // Construct a tractor + this->tractor = tractor; - // Override the get_frame method - service->get_frame = service_get_frame; + // The first plant will be connected to the mulitrack + this->producer = MLT_MULTITRACK_SERVICE( this->multitrack ); - // Connect to the producer immediately - if ( mlt_service_connect_producer( service, producer, 0 ) == 0 ) - this->producer = producer; + // Connect the tractor to the multitrack + mlt_tractor_connect( this->tractor, this->producer ); + } // Return this return this; } /** Get the service associated to this field. -*/ + * + * \public \memberof mlt_field_s + * \param this a field + * \return the tractor as a service + */ mlt_service mlt_field_service( mlt_field this ) { - return &this->parent; + return MLT_TRACTOR_SERVICE( this->tractor ); +} + +/** Get the multitrack. + * + * \public \memberof mlt_field_s + * \param this a field + * \return the multitrack + */ + +mlt_multitrack mlt_field_multitrack( mlt_field this ) +{ + return this != NULL ? this->multitrack : NULL; +} + +/** Get the tractor. + * + * \public \memberof mlt_field_s + * \param this a field + * \return the tractor + */ + +mlt_tractor mlt_field_tractor( mlt_field this ) +{ + return this != NULL ? this->tractor : NULL; } /** Get the properties associated to this field. -*/ + * + * \public \memberof mlt_field_s + * \param this a field + * \return a properties list + */ mlt_properties mlt_field_properties( mlt_field this ) { - return mlt_service_properties( &this->parent ); + return MLT_SERVICE_PROPERTIES( mlt_field_service( this ) ); } /** Plant a filter. -*/ + * + * \public \memberof mlt_field_s + * \param this a field + * \param that a filter + * \param track the track index + * \return true if there was an error + */ int mlt_field_plant_filter( mlt_field this, mlt_filter that, int track ) { @@ -106,15 +177,28 @@ int mlt_field_plant_filter( mlt_field this, mlt_filter that, int track ) // If sucessful, then we'll use this for connecting in the future if ( result == 0 ) { - // Update last - this->producer = mlt_filter_service( that ); + // This is now the new producer + this->producer = MLT_FILTER_SERVICE( that ); + + // Reconnect tractor to new producer + mlt_tractor_connect( this->tractor, this->producer ); + + // Fire an event + mlt_events_fire( mlt_field_properties( this ), "service-changed", NULL ); } return result; } /** Plant a transition. -*/ + * + * \public \memberof mlt_field_s + * \param this a field + * \param that a transition + * \param a_track input A's track index + * \param b_track input B's track index + * \return true if there was an error + */ int mlt_field_plant_transition( mlt_field this, mlt_transition that, int a_track, int b_track ) { @@ -124,28 +208,63 @@ int mlt_field_plant_transition( mlt_field this, mlt_transition that, int a_track // If sucessful, then we'll use this for connecting in the future if ( result == 0 ) { - // Update last - this->producer = mlt_transition_service( that ); + // This is now the new producer + this->producer = MLT_TRANSITION_SERVICE( that ); + + // Reconnect tractor to new producer + mlt_tractor_connect( this->tractor, this->producer ); + + // Fire an event + mlt_events_fire( mlt_field_properties( this ), "service-changed", NULL ); } return 0; } -/** Get a frame. -*/ +/** Close the field. + * + * \public \memberof mlt_field_s + * \param this a field + */ -static int service_get_frame( mlt_service service, mlt_frame_ptr frame, int index ) +void mlt_field_close( mlt_field this ) { - mlt_field this = service->child; - return mlt_service_get_frame( this->producer, frame, index ); + if ( this != NULL && mlt_properties_dec_ref( mlt_field_properties( this ) ) <= 0 ) + { + //mlt_tractor_close( this->tractor ); + //mlt_multitrack_close( this->multitrack ); + free( this ); + } } -/** Close the field. -*/ +/** Remove a filter or transition from the field. + * + * \public \memberof mlt_field_s + * \param self a field + * \param service the filter or transition to remove + */ -void mlt_field_close( mlt_field this ) +void mlt_field_disconnect_service( mlt_field self, mlt_service service ) { - mlt_service_close( &this->parent ); - free( this ); + mlt_service p = mlt_service_producer( service ); + mlt_service c = mlt_service_consumer( service); + int i; + switch ( mlt_service_identify(c) ) + { + case filter_type: + i = mlt_filter_get_track( MLT_FILTER(c) ); + mlt_service_connect_producer( c, p, i ); + break; + case transition_type: + i = mlt_transition_get_a_track ( MLT_TRANSITION(c) ); + mlt_service_connect_producer( c, p, i ); + MLT_TRANSITION(c)->producer = p; + break; + case tractor_type: + self->producer = p; + mlt_tractor_connect( MLT_TRACTOR(c), p ); + default: + break; + } + mlt_events_fire( mlt_field_properties( self ), "service-changed", NULL ); } -