mlt_properties properties;
mlt_deque queue;
pthread_t thread;
+ int joined;
int running;
uint8_t audio_buffer[ 4096 * 10 ];
int audio_avail;
static void consumer_close( mlt_consumer parent );
static void *consumer_thread( void * );
static int consumer_get_dimensions( int *width, int *height );
+static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt_service this, void **args );
/** This is what will be called by the factory - anything can be passed in
via the argument, but keep it simple.
// Get sample aspect ratio
this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" );
+
+ // Ensure we don't join on a non-running object
+ this->joined = 1;
// Default display aspect ratio
this->display_aspect = 4.0 / 3.0;
parent->stop = consumer_stop;
parent->is_stopped = consumer_is_stopped;
+ // Register specific events
+ mlt_events_register( this->properties, "consumer-sdl-event", ( mlt_transmitter )consumer_sdl_event );
+
// Return the consumer produced
return parent;
}
return NULL;
}
+static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt_service this, void **args )
+{
+ if ( listener != NULL )
+ listener( owner, this, ( SDL_Event * )args[ 0 ] );
+}
+
int consumer_start( mlt_consumer parent )
{
consumer_sdl this = parent->child;
{
pthread_attr_t thread_attributes;
+ consumer_stop( parent );
+
this->running = 1;
+ this->joined = 0;
// Allow the user to force resizing to window size
if ( mlt_properties_get_int( this->properties, "resize" ) )
// Inherit the scheduling priority
pthread_attr_init( &thread_attributes );
pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED );
-
+
pthread_create( &this->thread, &thread_attributes, consumer_thread, this );
}
// Get the actual object
consumer_sdl this = parent->child;
- if ( this->running )
+ if ( this->joined == 0 )
{
// Kill the thread and clean up
this->running = 0;
pthread_mutex_unlock( &this->audio_mutex );
pthread_join( this->thread, NULL );
+ this->joined = 1;
}
return 0;
if ( mlt_properties_get_int( properties, "video_off" ) == 0 )
{
// Get the image, width and height
+ mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
// Handle events
while ( SDL_PollEvent( &event ) )
{
+ mlt_events_fire( this->properties, "consumer-sdl-event", &event, NULL );
+
switch( event.type )
{
case SDL_VIDEORESIZE:
mlt_frame_close( next );
}
+ mlt_consumer_stopped( &this->parent );
+
return NULL;
}