* 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 "producer_inigo.h"
static mlt_filter create_attach( mlt_field field, char *id, int track )
{
- char *arg = strchr( id, ':' );
+ char *temp = strdup( id );
+ char *arg = strchr( temp, ':' );
if ( arg != NULL )
*arg ++ = '\0';
- mlt_filter filter = mlt_factory_filter( id, arg );
+ mlt_filter filter = mlt_factory_filter( temp, arg );
if ( filter != NULL )
track_service( field, filter, ( mlt_destructor )mlt_filter_close );
+ free( temp );
return filter;
}
static mlt_filter create_filter( mlt_field field, char *id, int track )
{
- char *arg = strchr( id, ':' );
+ char *temp = strdup( id );
+ char *arg = strchr( temp, ':' );
if ( arg != NULL )
*arg ++ = '\0';
- mlt_filter filter = mlt_factory_filter( id, arg );
+ mlt_filter filter = mlt_factory_filter( temp, arg );
if ( filter != NULL )
{
mlt_field_plant_filter( field, filter, track );
track_service( field, filter, ( mlt_destructor )mlt_filter_close );
}
+ free( temp );
return filter;
}
mlt_multitrack multitrack = mlt_tractor_multitrack( tractor );
char *title = NULL;
+ // Assistance for template construction (allows -track usage to specify the first track)
+ mlt_properties_set_int( MLT_PLAYLIST_PROPERTIES( playlist ), "_inigo_first", 1 );
+
// We need to track the number of registered filters
mlt_properties_set_int( field_properties, "registered", 0 );
}
else if ( !strcmp( argv[ i ], "-attach" ) ||
!strcmp( argv[ i ], "-attach-cut" ) ||
+ !strcmp( argv[ i ], "-attach-track" ) ||
!strcmp( argv[ i ], "-attach-clip" ) )
{
int type = !strcmp( argv[ i ], "-attach" ) ? 0 :
!strcmp( argv[ i ], "-attach-cut" ) ? 1 :
- 2;
+ !strcmp( argv[ i ], "-attach-track" ) ? 2 : 3;
mlt_filter filter = create_attach( field, argv[ ++ i ], track );
if ( producer != NULL && !mlt_producer_is_cut( producer ) )
{
else if ( type == 1 )
mlt_service_attach( ( mlt_service )producer, filter );
else if ( type == 2 )
+ mlt_service_attach( ( mlt_service )playlist, filter );
+ else if ( type == 3 )
mlt_service_attach( ( mlt_service )mlt_producer_cut_parent( producer ), filter );
properties = MLT_FILTER_PROPERTIES( filter );
mlt_properties_inherit( properties, group );
}
+ else if ( filter != NULL )
+ {
+ mlt_service_attach( ( mlt_service )playlist, filter );
+ properties = MLT_FILTER_PROPERTIES( filter );
+ mlt_properties_inherit( properties, group );
+ }
}
else if ( !strcmp( argv[ i ], "-repeat" ) )
{
if ( mlt_playlist_count( playlist ) > 0 )
{
mlt_playlist_clip_info info;
- mlt_playlist_join( playlist, mlt_playlist_count( playlist ) - clips - 1, clips, 0 );
+ int clip = clips <= 0 ? 0 : mlt_playlist_count( playlist ) - clips - 1;
+ if ( clip < 0 ) clip = 0;
+ if ( clip >= mlt_playlist_count( playlist ) ) clip = mlt_playlist_count( playlist ) - 2;
+ if ( clips < 0 ) clips = mlt_playlist_count( playlist ) - 1;
+ mlt_playlist_join( playlist, clip, clips, 0 );
mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
producer = info.cut;
properties = MLT_PRODUCER_PROPERTIES( producer );
if ( producer != NULL && !mlt_producer_is_cut( producer ) )
mlt_playlist_append( playlist, producer );
producer = NULL;
- if ( mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( playlist ) ) > 0 )
+ if ( !mlt_properties_get_int( MLT_PLAYLIST_PROPERTIES( playlist ), "_inigo_first" ) ||
+ mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( playlist ) ) > 0 )
{
mlt_multitrack_connect( multitrack, MLT_PLAYLIST_PRODUCER( playlist ), track ++ );
track_service( field, playlist, ( mlt_destructor )mlt_playlist_close );
track_service( field, playlist, ( mlt_destructor )mlt_playlist_close );
// We must have a playlist to connect
- if ( mlt_playlist_count( playlist ) > 0 )
+ if ( !mlt_properties_get_int( MLT_PLAYLIST_PROPERTIES( playlist ), "_inigo_first" ) ||
+ mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( playlist ) ) > 0 )
mlt_multitrack_connect( multitrack, MLT_PLAYLIST_PRODUCER( playlist ), track );
mlt_producer prod = MLT_TRACTOR_PRODUCER( tractor );
projects / melted / blobdiff