X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=378a78b560e2c58727b6a6f0c46a0db5cf4beab4;hb=65e8ac86ee6e17a12892954ff4a8d46c4766fe0d;hp=4bc6660f1bb71d94aa45115af861a60f129587d8;hpb=5941e41209b87a8ed26f273f170abbd484113938;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 4bc6660..378a78b 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -29,13 +29,6 @@ #include #include -#ifdef __DARWIN__ -# include "consumer_sdl_osx_hack.h" -# import -# import -#endif - - /** This classes definition. */ @@ -87,16 +80,6 @@ static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt mlt_consumer consumer_sdl_init( char *arg ) { -#ifdef __DARWIN__ - // Initialize Cocoa - NSApplicationLoad(); - [NSApplication sharedApplication]; - - // Spawn a fake thread so that cocoa knows to be multithreaded - DummyThread *dummy = [[DummyThread alloc] init]; - [NSThread detachNewThreadSelector:@selector(startThread:) toTarget:dummy withObject:nil]; -#endif - // Create the consumer object consumer_sdl this = calloc( sizeof( struct consumer_sdl_s ), 1 ); @@ -196,6 +179,32 @@ int consumer_start( mlt_consumer parent ) this->width = mlt_properties_get_int( this->properties, "width" ); this->height = mlt_properties_get_int( this->properties, "height" ); + this->bpp = mlt_properties_get_int( this->properties, "bpp" ); + + if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 ) + { + if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 ) + { + fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() ); + return -1; + } + + SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL ); + SDL_EnableUNICODE( 1 ); + } + else + { + if ( SDL_GetVideoSurface( ) != NULL ) + { + this->sdl_screen = SDL_GetVideoSurface( ); + consumer_get_dimensions( &this->window_width, &this->window_height ); + mlt_properties_set_int( this->properties, "changed", 0 ); + } + } + + if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" ) ) + SDL_InitSubSystem( SDL_INIT_AUDIO ); + pthread_create( &this->thread, NULL, consumer_thread, this ); } @@ -213,6 +222,19 @@ int consumer_stop( mlt_consumer parent ) this->joined = 1; this->running = 0; pthread_join( this->thread, NULL ); + + // internal cleanup + if ( this->sdl_overlay != NULL ) + SDL_FreeYUVOverlay( this->sdl_overlay ); + this->sdl_overlay = NULL; + + if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" ) ) + SDL_QuitSubSystem( SDL_INIT_AUDIO ); + + if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 ) + SDL_Quit( ); + + this->sdl_screen = NULL; } return 0; @@ -541,10 +563,6 @@ static void *video_thread( void *arg ) // Identify the arg consumer_sdl this = arg; -#ifdef __DARWIN__ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - // Obtain time of thread start struct timeval now; int64_t start = 0; @@ -628,10 +646,6 @@ static void *video_thread( void *arg ) mlt_consumer_stopped( &this->parent ); -#ifdef __DARWIN__ - [pool release]; -#endif - return NULL; } @@ -643,10 +657,6 @@ static void *consumer_thread( void *arg ) // Identify the arg consumer_sdl this = arg; -#ifdef __DARWIN__ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - // Get the consumer mlt_consumer consumer = &this->parent; @@ -662,32 +672,6 @@ static void *consumer_thread( void *arg ) int64_t playtime = 0; struct timespec tm = { 0, 100000 }; - this->bpp = mlt_properties_get_int( this->properties, "bpp" ); - - if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "sdl_started" ) == 0 ) - { - if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 ) - { - fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() ); - return NULL; - } - - SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL ); - SDL_EnableUNICODE( 1 ); - } - else - { - if ( SDL_GetVideoSurface( ) != NULL ) - { - this->sdl_screen = SDL_GetVideoSurface( ); - consumer_get_dimensions( &this->window_width, &this->window_height ); - mlt_properties_set_int( this->properties, "changed", 0 ); - } - } - - if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "audio_off" ) ) - SDL_InitSubSystem( SDL_INIT_AUDIO ); - // Loop until told not to while( this->running ) { @@ -739,16 +723,6 @@ static void *consumer_thread( void *arg ) pthread_join( thread, NULL ); } - // internal cleanup - if ( this->sdl_overlay != NULL ) - SDL_FreeYUVOverlay( this->sdl_overlay ); - - if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "audio_off" ) ) - SDL_QuitSubSystem( SDL_INIT_AUDIO ); - - //if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "sdl_started" ) == 0 ) - //SDL_Quit( ); - while( mlt_deque_count( this->queue ) ) mlt_frame_close( mlt_deque_pop_back( this->queue ) ); @@ -756,10 +730,6 @@ static void *consumer_thread( void *arg ) this->sdl_overlay = NULL; this->audio_avail = 0; -#ifdef __DARWIN__ - [pool release]; -#endif - return NULL; } @@ -804,7 +774,7 @@ static int consumer_get_dimensions( int *width, int *height ) #endif // Unlock the display - sdl_lock_display(); + sdl_unlock_display(); return changed; }