X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fcore.c;h=2cbfd85dcdaa634bef4294b1fc622f3c12e42837;hb=5995f330ba3032e8b3fa70dcb8d1a1648b68f3db;hp=9db56144d44321dda1455f95b17e01f0dc2cebf7;hpb=6ebae83db81a80cdc3cead264455074702223ac0;p=vlc diff --git a/src/control/core.c b/src/control/core.c index 9db56144d4..2cbfd85dcd 100644 --- a/src/control/core.c +++ b/src/control/core.c @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -38,15 +39,14 @@ static const char nomemstr[] = "Insufficient memory"; void libvlc_exception_init( libvlc_exception_t *p_exception ) { p_exception->b_raised = 0; - p_exception->psz_message = NULL; } void libvlc_exception_clear( libvlc_exception_t *p_exception ) { - if( p_exception->psz_message != nomemstr ) - free( p_exception->psz_message ); - p_exception->psz_message = NULL; + if( NULL == p_exception ) + return; p_exception->b_raised = 0; + libvlc_clearerr (); } int libvlc_exception_raised( const libvlc_exception_t *p_exception ) @@ -54,49 +54,38 @@ int libvlc_exception_raised( const libvlc_exception_t *p_exception ) return (NULL != p_exception) && p_exception->b_raised; } -const char * -libvlc_exception_get_message( const libvlc_exception_t *p_exception ) -{ - if( p_exception->b_raised == 1 && p_exception->psz_message ) - { - return p_exception->psz_message; - } - return NULL; -} - static void libvlc_exception_not_handled( const char *psz ) { fprintf( stderr, "*** LibVLC Exception not handled: %s\nSet a breakpoint in '%s' to debug.\n", psz, __func__ ); + abort(); } void libvlc_exception_raise( libvlc_exception_t *p_exception, const char *psz_format, ... ) { va_list args; - char * psz; + + /* Make sure that there is no unnoticed previous exception */ + if( p_exception && p_exception->b_raised ) + { + libvlc_exception_not_handled( libvlc_errmsg() ); + libvlc_exception_clear( p_exception ); + } /* Unformat-ize the message */ va_start( args, psz_format ); - if( vasprintf( &psz, psz_format, args ) == -1) - psz = (char *)nomemstr; + libvlc_vprinterr( psz_format, args ); va_end( args ); /* Does caller care about exceptions ? */ if( p_exception == NULL ) { /* Print something, so that lazy third-parties can easily * notice that something may have gone unnoticedly wrong */ - libvlc_exception_not_handled( psz ); + libvlc_exception_not_handled( libvlc_errmsg() ); return; } - /* Make sure that there is no unnoticed previous exception */ - if( p_exception->b_raised ) - { - libvlc_exception_not_handled( p_exception->psz_message ); - libvlc_exception_clear( p_exception ); - } - p_exception->psz_message = psz; p_exception->b_raised = 1; } @@ -105,11 +94,22 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv, { libvlc_instance_t *p_new; int i_ret; + + libvlc_init_threads (); + libvlc_int_t *p_libvlc_int = libvlc_InternalCreate(); - if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" ); + if( !p_libvlc_int ) + { + libvlc_deinit_threads (); + RAISENULL( "VLC initialization failed" ); + } - p_new = (libvlc_instance_t *)malloc( sizeof( libvlc_instance_t ) ); - if( !p_new ) RAISENULL( "Out of memory" ); + p_new = malloc( sizeof( libvlc_instance_t ) ); + if( !p_new ) + { + libvlc_deinit_threads (); + RAISENULL( "Out of memory" ); + } const char *my_argv[argc + 2]; @@ -121,19 +121,27 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv, /** \todo Look for interface settings. If we don't have any, add -I dummy */ /* Because we probably don't want a GUI by default */ - i_ret=libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ); - if( i_ret == VLC_EEXITSUCCESS ) + i_ret = libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ); + if( i_ret ) + { + libvlc_InternalDestroy( p_libvlc_int ); + free( p_new ); + libvlc_deinit_threads (); + + if( i_ret == VLC_EEXITSUCCESS ) return NULL; - else if( i_ret != 0 ) - RAISENULL( "VLC initialization failed" ); + else + RAISENULL( "VLC initialization failed" ); + } p_new->p_libvlc_int = p_libvlc_int; - p_new->p_vlm = NULL; - p_new->b_playlist_locked = 0; + p_new->libvlc_vlm.p_vlm = NULL; + p_new->libvlc_vlm.p_event_manager = NULL; + p_new->libvlc_vlm.pf_release = NULL; p_new->ref_count = 1; + p_new->verbosity = 1; p_new->p_callback_list = NULL; vlc_mutex_init(&p_new->instance_lock); - vlc_mutex_init(&p_new->event_callback_lock); return p_new; } @@ -153,41 +161,38 @@ void libvlc_release( libvlc_instance_t *p_instance ) vlc_mutex_t *lock = &p_instance->instance_lock; int refs; - assert( p_instance->ref_count > 0 ); - vlc_mutex_lock( lock ); + assert( p_instance->ref_count > 0 ); refs = --p_instance->ref_count; vlc_mutex_unlock( lock ); if( refs == 0 ) { vlc_mutex_destroy( lock ); - vlc_mutex_destroy( &p_instance->event_callback_lock ); + if( p_instance->libvlc_vlm.pf_release ) + p_instance->libvlc_vlm.pf_release( p_instance ); libvlc_InternalCleanup( p_instance->p_libvlc_int ); libvlc_InternalDestroy( p_instance->p_libvlc_int ); free( p_instance ); + libvlc_deinit_threads (); } } -void libvlc_add_intf( libvlc_instance_t *p_i, const char *name, +int libvlc_add_intf( libvlc_instance_t *p_i, const char *name, libvlc_exception_t *p_e ) { if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name ) ) - RAISEVOID( "Interface initialization failed" ); + { + libvlc_exception_raise( p_e, "Interface initialization failed" ); + return -1; + } + return 0; } void libvlc_wait( libvlc_instance_t *p_i ) { libvlc_int_t *p_libvlc = p_i->p_libvlc_int; - vlc_object_lock( p_libvlc ); - while( vlc_object_alive( p_libvlc ) ) - vlc_object_wait( p_libvlc ); - vlc_object_unlock( p_libvlc ); -} - -int libvlc_get_vlc_id( libvlc_instance_t *p_instance ) -{ - return p_instance->p_libvlc_int->i_object_id; + libvlc_InternalWait( p_libvlc ); } const char * libvlc_get_version(void) @@ -202,5 +207,18 @@ const char * libvlc_get_compiler(void) const char * libvlc_get_changeset(void) { - return VLC_Changeset(); + extern const char psz_vlc_changeset[]; + return psz_vlc_changeset; +} + +/* export internal libvlc_instance for ugly hacks with libvlccore */ +vlc_object_t *libvlc_get_vlc_instance( libvlc_instance_t* p_instance ) +{ + vlc_object_hold( p_instance->p_libvlc_int ) ; + return (vlc_object_t*) p_instance->p_libvlc_int ; +} + +void libvlc_free( void *ptr ) +{ + free( ptr ); }