* Copyright (C) 2004-2005 Ushodaya Enterprises Limited
* Author: Charles Yates
*
- * 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 "consumer_sdl.h"
if ( !this->running )
{
+ // properties
mlt_properties properties = MLT_CONSUMER_PROPERTIES( parent );
+ mlt_properties play = MLT_CONSUMER_PROPERTIES( this->play );
+ mlt_properties still = MLT_CONSUMER_PROPERTIES( this->still );
+
char *window_id = mlt_properties_get( properties, "window_id" );
char *audio_driver = mlt_properties_get( properties, "audio_driver" );
+ char *video_driver = mlt_properties_get( properties, "video_driver" );
+ char *audio_device = mlt_properties_get( properties, "audio_device" );
+ char *output_display = mlt_properties_get( properties, "output_display" );
+ int progressive = mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" );
consumer_stop( parent );
this->joined = 0;
this->last_speed = 1;
+ if ( output_display != NULL )
+ setenv( "DISPLAY", output_display, 1 );
+
if ( window_id != NULL )
setenv( "SDL_WINDOWID", window_id, 1 );
+ if ( video_driver != NULL )
+ setenv( "SDL_VIDEODRIVER", video_driver, 1 );
+
if ( audio_driver != NULL )
setenv( "SDL_AUDIODRIVER", audio_driver, 1 );
+ if ( audio_device != NULL )
+ setenv( "AUDIODEV", audio_device, 1 );
+
if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
{
fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() );
SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
SDL_EnableUNICODE( 1 );
- //mlt_consumer_start( this->still );
+ // Pass properties down
+ mlt_properties_set_data( play, "transport_producer", mlt_properties_get_data( properties, "transport_producer", NULL ), 0, NULL, NULL );
+ mlt_properties_set_data( still, "transport_producer", mlt_properties_get_data( properties, "transport_producer", NULL ), 0, NULL, NULL );
+ mlt_properties_set_data( play, "transport_callback", mlt_properties_get_data( properties, "transport_callback", NULL ), 0, NULL, NULL );
+ mlt_properties_set_data( still, "transport_callback", mlt_properties_get_data( properties, "transport_callback", NULL ), 0, NULL, NULL );
+
+ mlt_properties_set_int( play, "progressive", progressive );
+ mlt_properties_set_int( still, "progressive", progressive );
+
+ mlt_properties_pass_list( play, properties, "resize,rescale,width,height,aspect_ratio,display_ratio,volume" );
+ mlt_properties_pass_list( still, properties, "resize,rescale,width,height,aspect_ratio,display_ratio" );
+ mlt_properties_pass_list( play, properties, "deinterlace_method" );
+ mlt_properties_pass_list( still, properties, "deinterlace_method" );
+ mlt_properties_pass_list( play, properties, "preview_off,preview_format" );
+ mlt_properties_pass_list( still, properties, "preview_off,preview_format" );
+
+ mlt_properties_pass( play, properties, "play." );
+ mlt_properties_pass( still, properties, "still." );
+
+ mlt_properties_set_data( play, "app_lock", mlt_properties_get_data( properties, "app_lock", NULL ), 0, NULL, NULL );
+ mlt_properties_set_data( still, "app_lock", mlt_properties_get_data( properties, "app_lock", NULL ), 0, NULL, NULL );
+ mlt_properties_set_data( play, "app_unlock", mlt_properties_get_data( properties, "app_unlock", NULL ), 0, NULL, NULL );
+ mlt_properties_set_data( still, "app_unlock", mlt_properties_get_data( properties, "app_unlock", NULL ), 0, NULL, NULL );
+
+ mlt_properties_set_int( play, "put_mode", 1 );
+ mlt_properties_set_int( still, "put_mode", 1 );
+
+ // Start the still producer just to initialise the gui
+ mlt_consumer_start( this->still );
+ this->active = this->still;
+
+ // Inform child consumers that we control the sdl
+ mlt_properties_set_int( play, "sdl_started", 1 );
+ mlt_properties_set_int( still, "sdl_started", 1 );
pthread_create( &this->thread, NULL, consumer_thread, this );
}
// Get the consumer
mlt_consumer consumer = &this->parent;
+ // Get the properties
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
+
// internal intialization
int first = 1;
mlt_frame frame = NULL;
int last_position = -1;
- // properties
- mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
- mlt_properties play = MLT_CONSUMER_PROPERTIES( this->play );
- mlt_properties still = MLT_CONSUMER_PROPERTIES( this->still );
-
- int progressive = mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" );
-
- // Inform child consumers that we control the sdl
- mlt_properties_set_int( play, "sdl_started", 1 );
- mlt_properties_set_int( still, "sdl_started", 1 );
-
- // Pass properties down
- mlt_properties_set_data( play, "transport_producer", mlt_properties_get_data( properties, "transport_producer", NULL ), 0, NULL, NULL );
- mlt_properties_set_data( still, "transport_producer", mlt_properties_get_data( properties, "transport_producer", NULL ), 0, NULL, NULL );
- mlt_properties_set_data( play, "transport_callback", mlt_properties_get_data( properties, "transport_callback", NULL ), 0, NULL, NULL );
- mlt_properties_set_data( still, "transport_callback", mlt_properties_get_data( properties, "transport_callback", NULL ), 0, NULL, NULL );
- mlt_properties_set_int( play, "resize", mlt_properties_get_int( properties, "resize" ) );
- mlt_properties_set_int( still, "resize", mlt_properties_get_int( properties, "resize" ) );
- mlt_properties_set( play, "rescale", mlt_properties_get( properties, "rescale" ) );
- mlt_properties_set( still, "rescale", mlt_properties_get( properties, "rescale" ) );
- mlt_properties_set_int( play, "width", mlt_properties_get_int( properties, "width" ) );
- mlt_properties_set_int( still, "width", mlt_properties_get_int( properties, "width" ) );
- mlt_properties_set_int( play, "height", mlt_properties_get_int( properties, "height" ) );
- mlt_properties_set_int( still, "height", mlt_properties_get_int( properties, "height" ) );
- mlt_properties_set_double( play, "aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) );
- mlt_properties_set_double( still, "aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) );
- mlt_properties_set_double( play, "display_ratio", mlt_properties_get_double( properties, "display_ratio" ) );
- mlt_properties_set_double( still, "display_ratio", mlt_properties_get_double( properties, "display_ratio" ) );
-
- mlt_properties_set_int( play, "progressive", progressive );
- mlt_properties_set_int( still, "progressive", progressive );
- mlt_properties_set( play, "deinterlace_method", mlt_properties_get( properties, "deinterlace_method" ) );
- mlt_properties_set( still, "deinterlace_method", mlt_properties_get( properties, "deinterlace_method" ) );
-
- mlt_properties_pass( play, MLT_CONSUMER_PROPERTIES( consumer ), "play." );
- mlt_properties_pass( still, MLT_CONSUMER_PROPERTIES( consumer ), "still." );
-
- mlt_properties_set_data( play, "app_lock", mlt_properties_get_data( properties, "app_lock", NULL ), 0, NULL, NULL );
- mlt_properties_set_data( still, "app_lock", mlt_properties_get_data( properties, "app_lock", NULL ), 0, NULL, NULL );
- mlt_properties_set_data( play, "app_unlock", mlt_properties_get_data( properties, "app_unlock", NULL ), 0, NULL, NULL );
- mlt_properties_set_data( still, "app_unlock", mlt_properties_get_data( properties, "app_unlock", NULL ), 0, NULL, NULL );
-
- mlt_properties_set_int( play, "put_mode", 1 );
- mlt_properties_set_int( still, "put_mode", 1 );
+ // Determine if the application is dealing with the preview
+ int preview_off = mlt_properties_get_int( properties, "preview_off" );
this->refresh_count = 0;
}
// Copy the rectangle info from the active consumer
- if ( this->running )
+ if ( this->running && preview_off == 0 )
{
mlt_properties active = MLT_CONSUMER_PROPERTIES( this->active );
mlt_service_lock( MLT_CONSUMER_SERVICE( consumer ) );
projects / melted / blobdiff