* 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 <stdio.h>
#include <stdlib.h>
-struct mlt_track_s
-{
- mlt_producer producer;
- mlt_event event;
-};
-
-typedef struct mlt_track_s *mlt_track;
-
-/** Private definition.
-*/
-
-struct mlt_multitrack_s
-{
- // We're extending producer here
- struct mlt_producer_s parent;
- mlt_track *list;
- int size;
- int count;
-};
-
/** Forward reference.
*/
mlt_producer producer = &this->parent;
if ( mlt_producer_init( producer, this ) == 0 )
{
- mlt_properties properties = mlt_multitrack_properties( this );
+ mlt_properties properties = MLT_MULTITRACK_PROPERTIES( this );
producer->get_frame = producer_get_frame;
mlt_properties_set_data( properties, "multitrack", this, 0, NULL, NULL );
mlt_properties_set( properties, "log_id", "multitrack" );
mlt_properties_set( properties, "resource", "<multitrack>" );
+ mlt_properties_set_int( properties, "in", 0 );
+ mlt_properties_set_int( properties, "out", -1 );
+ mlt_properties_set_int( properties, "length", 0 );
+ producer->close = ( mlt_destructor )mlt_multitrack_close;
}
else
{
mlt_service mlt_multitrack_service( mlt_multitrack this )
{
- return mlt_producer_service( mlt_multitrack_producer( this ) );
+ return MLT_MULTITRACK_SERVICE( this );
}
/** Get the properties associated this multitrack.
mlt_properties mlt_multitrack_properties( mlt_multitrack this )
{
- return mlt_service_properties( mlt_multitrack_service( this ) );
+ return MLT_MULTITRACK_PROPERTIES( this );
}
/** Initialise position related information.
int i = 0;
// Obtain the properties of this multitrack
- mlt_properties properties = mlt_multitrack_properties( this );
+ mlt_properties properties = MLT_MULTITRACK_PROPERTIES( this );
// We need to ensure that the multitrack reports the longest track as its length
mlt_position length = 0;
{
// If we have more than 1 track, we must be in continue mode
if ( this->count > 1 )
- mlt_properties_set( mlt_producer_properties( producer ), "eof", "continue" );
+ mlt_properties_set( MLT_PRODUCER_PROPERTIES( producer ), "eof", "continue" );
// Determine the longest length
- if ( !mlt_properties_get_int( mlt_producer_properties( producer ), "hide" ) )
+ //if ( !mlt_properties_get_int( MLT_PRODUCER_PROPERTIES( producer ), "hide" ) )
length = mlt_producer_get_playtime( producer ) > length ? mlt_producer_get_playtime( producer ) : length;
// Handle fps
fprintf( stderr, "Warning: fps mismatch on track %d\n", i );
// It should be safe to impose fps on an image producer, but not necessarily safe for video
- mlt_properties_set_double( mlt_producer_properties( producer ), "fps", fps );
+ mlt_properties_set_double( MLT_PRODUCER_PROPERTIES( producer ), "fps", fps );
}
}
}
int mlt_multitrack_connect( mlt_multitrack this, mlt_producer producer, int track )
{
// Connect to the producer to ourselves at the specified track
- int result = mlt_service_connect_producer( mlt_multitrack_service( this ), mlt_producer_service( producer ), track );
+ int result = mlt_service_connect_producer( MLT_MULTITRACK_SERVICE( this ), MLT_PRODUCER_SERVICE( producer ), track );
if ( result == 0 )
{
// Assign the track in our list here
this->list[ track ]->producer = producer;
- this->list[ track ]->event = mlt_events_listen( mlt_producer_properties( producer ), this,
+ this->list[ track ]->event = mlt_events_listen( MLT_PRODUCER_PROPERTIES( producer ), this,
"producer-changed", ( mlt_listener )mlt_multitrack_listener );
- mlt_properties_inc_ref( mlt_producer_properties( producer ) );
+ mlt_properties_inc_ref( MLT_PRODUCER_PROPERTIES( producer ) );
mlt_event_inc_ref( this->list[ track ]->event );
// Increment the track count if need be
if ( producer != NULL )
{
// Get the properties of this producer
- mlt_properties properties = mlt_producer_properties( producer );
+ mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
// Determine if it's a playlist
mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL );
break;
case mlt_whence_relative_current:
- position = mlt_producer_position( mlt_multitrack_producer( this ) );
+ position = mlt_producer_position( MLT_MULTITRACK_PRODUCER( this ) );
for ( i = 0; i < count - 2; i ++ )
if ( position >= map[ i ] && position < map[ i + 1 ] )
break;
out of sync.
See playlist logic too.
-
- This is not as clean as it should be...
*/
static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int index )
// Check if we have a track for this index
if ( index < this->count && this->list[ index ] != NULL )
{
- // Determine the in point
- int in = mlt_producer_is_cut( this->list[ index ]->producer ) ? mlt_producer_get_in( this->list[ index ]->producer ) : 0;
-
// Get the producer for this track
- mlt_producer producer = mlt_producer_cut_parent( this->list[ index ]->producer );
+ mlt_producer producer = this->list[ index ]->producer;
+
+ // Get the track hide property
+ int hide = mlt_properties_get_int( MLT_PRODUCER_PROPERTIES( mlt_producer_cut_parent( producer ) ), "hide" );
// Obtain the current position
mlt_position position = mlt_producer_frame( parent );
- // Get the clone index
- int clone_index = mlt_properties_get_int( mlt_producer_properties( this->list[ index ]->producer ), "_clone" );
+ // Get the parent properties
+ mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( parent );
- // Additionally, check if we're supposed to use a clone here
- if ( clone_index > 0 )
- {
- char key[ 25 ];
- sprintf( key, "_clone.%d", clone_index - 1 );
- producer = mlt_properties_get_data( mlt_producer_properties( producer ), key, NULL );
- }
+ // Get the speed
+ double speed = mlt_properties_get_double( producer_properties, "_speed" );
// Make sure we're at the same point
- mlt_producer_seek( producer, in + position );
+ mlt_producer_seek( producer, position );
// Get the frame from the producer
- mlt_service_get_frame( mlt_producer_service( producer ), frame, 0 );
+ mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), frame, 0 );
// Indicate speed of this producer
- mlt_properties producer_properties = mlt_producer_properties( parent );
- double speed = mlt_properties_get_double( producer_properties, "_speed" );
- mlt_properties properties = mlt_frame_properties( *frame );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( *frame );
mlt_properties_set_double( properties, "_speed", speed );
mlt_properties_set_position( properties, "_position", position );
- mlt_properties_set_int( properties, "hide", mlt_properties_get_int( mlt_producer_properties( producer ), "hide" ) );
+ mlt_properties_set_int( properties, "hide", hide );
}
else
{
if ( index >= this->count )
{
// Let tractor know if we've reached the end
- mlt_properties_set_int( mlt_frame_properties( *frame ), "last_track", 1 );
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( *frame ), "last_track", 1 );
// Move to the next frame
mlt_producer_prepare_next( parent );
void mlt_multitrack_close( mlt_multitrack this )
{
- if ( this != NULL && mlt_properties_dec_ref( mlt_multitrack_properties( this ) ) <= 0 )
+ if ( this != NULL && mlt_properties_dec_ref( MLT_MULTITRACK_PROPERTIES( this ) ) <= 0 )
{
int i = 0;
for ( i = 0; i < this->count; i ++ )
}
// Close the producer
+ this->parent.close = NULL;
mlt_producer_close( &this->parent );
// Free the list
projects / melted / blobdiff