X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fcore.c;h=5131ab3c0b67f72737b4e22bf97cbf3e0caf3562;hb=09020b63ba7513eeaff38f1cc40e2b4937c61030;hp=50664d1738546d494f65a9e20a18b22d11d10e26;hpb=a62595b97ffddfb1e75827354ff56da227f44cad;p=vlc diff --git a/src/control/core.c b/src/control/core.c index 50664d1738..5131ab3c0b 100644 --- a/src/control/core.c +++ b/src/control/core.c @@ -21,10 +21,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "libvlc_internal.h" #include #include +#include #include #include @@ -38,15 +43,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,88 +58,64 @@ 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, ... ) +void libvlc_exception_raise( libvlc_exception_t *p_exception ) { - va_list args; - char * psz; - - /* Unformat-ize the message */ - va_start( args, psz_format ); - if( vasprintf( &psz, psz_format, args ) == -1) - psz = (char *)nomemstr; - va_end( args ); - /* Does caller care about exceptions ? */ if( p_exception == NULL ) { - /* Print something, so lazy third-parties can easily - * notice that something may have gone unoticedly wrong */ - libvlc_exception_not_handled( psz ); + /* Print something, so that lazy third-parties can easily + * notice that something may have gone unnoticedly wrong */ + libvlc_exception_not_handled( libvlc_errmsg() ); return; } - /* Make sure that there is no unoticed 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; } -libvlc_instance_t * libvlc_new( int argc, const char *const *argv, - libvlc_exception_t *p_e ) +libvlc_instance_t * libvlc_new( int argc, const char *const *argv ) { - libvlc_instance_t *p_new; - int i_ret; - libvlc_int_t *p_libvlc_int = libvlc_InternalCreate(); - if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" ); + libvlc_instance_t *p_new = malloc (sizeof (*p_new)); + if (unlikely(p_new == NULL)) + return NULL; - p_new = (libvlc_instance_t *)malloc( sizeof( libvlc_instance_t ) ); - if( !p_new ) RAISENULL( "Out of memory" ); + libvlc_init_threads (); const char *my_argv[argc + 2]; - my_argv[0] = "libvlc"; /* dummy arg0, skipped by getopt() et al */ for( int i = 0; i < argc; i++ ) my_argv[i + 1] = argv[i]; my_argv[argc + 1] = NULL; /* C calling conventions require a NULL */ - /** \todo Look for interface settings. If we don't have any, add -I dummy */ - /* Because we probably don't want a GUI by default */ + libvlc_int_t *p_libvlc_int = libvlc_InternalCreate(); + if (unlikely (p_libvlc_int == NULL)) + goto error; - i_ret=libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ); - if( i_ret == VLC_EEXITSUCCESS ) - return NULL; - else if( i_ret != 0 ) - RAISENULL( "VLC initialization failed" ); + if (libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv )) + { + libvlc_InternalDestroy( p_libvlc_int ); + goto error; + } 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; + +error: + libvlc_deinit_threads (); + free (p_new); + return NULL; } void libvlc_retain( libvlc_instance_t *p_instance ) @@ -153,41 +133,32 @@ 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, false ); + 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, - libvlc_exception_t *p_e ) +int libvlc_add_intf( libvlc_instance_t *p_i, const char *name ) { - if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name ) ) - RAISEVOID( "Interface initialization failed" ); + return libvlc_InternalAddIntf( p_i->p_libvlc_int, name ) ? -1 : 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 +173,11 @@ 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; +} + +void libvlc_free( void *ptr ) +{ + free( ptr ); }