case $targetos in
Darwin)
- echo "CFLAGS+=-D__DARWIN__"
+ echo "CFLAGS+=-D__DARWIN__ `sdl-config --cflags`"
echo "SHFLAGS=-dynamiclib"
+ echo "LIBDL=`sdl-config --libs`"
;;
Linux)
echo "CFLAGS+=-pthread"
#include "mlt_parser.h"
#include "mlt_geometry.h"
+#ifdef __DARWIN__
+#include <SDL.h>
+#endif
+
#ifdef __cplusplus
}
#endif
int value = silent ? -1 : term_read( );
if ( value != -1 )
- transport_action( producer, ( char * )&value );
+ {
+ char string[ 2 ] = { value, 0 };
+ transport_action( producer, string );
+ }
if ( !silent && mlt_properties_get_int( properties, "stats_off" ) == 0 )
fprintf( stderr, "Current Position: %10d\r", (int)mlt_producer_position( producer ) );
#include <SDL/SDL_syswm.h>
#include <sys/time.h>
-#ifdef __DARWIN__
-# include "consumer_sdl_osx_hack.h"
-# import <AppKit/NSApplication.h>
-# import <Foundation/Foundation.h>
-#endif
-
-
/** This classes definition.
*/
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 );
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 );
}
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;
// 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;
mlt_consumer_stopped( &this->parent );
-#ifdef __DARWIN__
- [pool release];
-#endif
-
return NULL;
}
// Identify the arg
consumer_sdl this = arg;
-#ifdef __DARWIN__
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-#endif
-
// Get the consumer
mlt_consumer consumer = &this->parent;
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 )
{
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 ) );
this->sdl_overlay = NULL;
this->audio_avail = 0;
-#ifdef __DARWIN__
- [pool release];
-#endif
-
return NULL;
}
#endif
// Unlock the display
- sdl_lock_display();
+ sdl_unlock_display();
return changed;
}
if ( !this->running )
{
+ mlt_properties properties = MLT_CONSUMER_PROPERTIES( parent );
+ char *window_id = mlt_properties_get( properties, "window_id" );
+ char *audio_driver = mlt_properties_get( properties, "audio_driver" );
+
consumer_stop( parent );
this->running = 1;
this->joined = 0;
this->last_speed = 1;
+ if ( window_id != NULL )
+ setenv( "SDL_WINDOWID", window_id, 1 );
+
+ if ( audio_driver != NULL )
+ setenv( "SDL_AUDIODRIVER", audio_driver, 1 );
+
+ 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 );
+
pthread_create( &this->thread, NULL, consumer_thread, this );
}
this->joined = 1;
if ( app_locked && lock ) lock( );
+
+ SDL_Quit( );
}
return 0;
int progressive = mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" );
- 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 );
-
// Inform child consumers that we control the sdl
mlt_properties_set_int( play, "sdl_started", 1 );
mlt_properties_set_int( still, "sdl_started", 1 );
if ( this->play ) mlt_consumer_stop( this->play );
if ( this->still ) mlt_consumer_stop( this->still );
- //SDL_Quit( );
-
return NULL;
}
mlt_properties_set_int( this->properties, "height", this->height );
}
+ 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
+ {
+ mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( parent ), "changed", 2 );
+ if ( SDL_GetVideoSurface( ) != NULL )
+ {
+ this->sdl_screen = SDL_GetVideoSurface( );
+ consumer_get_dimensions( &this->window_width, &this->window_height );
+ mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( parent ), "changed", 0 );
+ }
+ }
+
pthread_create( &this->thread, NULL, consumer_thread, this );
}
pthread_join( this->thread, NULL );
this->joined = 1;
+
+ if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 )
+ SDL_Quit( );
+
+ this->sdl_screen = NULL;
}
return 0;
// internal intialization
mlt_frame frame = NULL;
- 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
- {
- mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( consumer ), "changed", 2 );
- if ( SDL_GetVideoSurface( ) != NULL )
- {
- this->sdl_screen = SDL_GetVideoSurface( );
- consumer_get_dimensions( &this->window_width, &this->window_height );
- mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( consumer ), "changed", 0 );
- }
- }
-
// Loop until told not to
while( this->running )
{
}
}
- if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "sdl_started" ) == 0 )
- SDL_Quit( );
-
- this->sdl_screen = NULL;
-
return NULL;
}