X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fcore.c;h=745c85af64a27b39ec8986d25912684ba8a73cff;hb=57a4f916876060dc51583f40483522a0ad1de8bc;hp=da2a9b2d969bec7c61fda01391d318814b5a8dc6;hpb=3e43a6a6ad94874b4a9d550ed5e439c735d923fa;p=vlc diff --git a/src/control/core.c b/src/control/core.c index da2a9b2d96..745c85af64 100644 --- a/src/control/core.c +++ b/src/control/core.c @@ -1,5 +1,5 @@ /***************************************************************************** - * core.c: Core libvlc new API functions : initialization, exceptions handling + * core.c: Core libvlc new API functions : initialization ***************************************************************************** * Copyright (C) 2005 the VideoLAN team * $Id$ @@ -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 @@ -32,121 +37,46 @@ static const char nomemstr[] = "Insufficient memory"; -/************************************************************************* - * Exceptions handling - *************************************************************************/ -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( NULL == p_exception ) - return; - if( p_exception->psz_message != nomemstr ) - free( p_exception->psz_message ); - p_exception->psz_message = NULL; - p_exception->b_raised = 0; -} - -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__ ); -} - -void libvlc_exception_raise( libvlc_exception_t *p_exception, - const char *psz_format, ... ) -{ - 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 that lazy third-parties can easily - * notice that something may have gone unnoticedly wrong */ - libvlc_exception_not_handled( psz ); - if( psz != nomemstr ) - free( psz ); - 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; -} - -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 = 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 ) + if (libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv )) { libvlc_InternalDestroy( p_libvlc_int ); - free( p_new ); - if( i_ret == VLC_EEXITSUCCESS ) - return NULL; - else - RAISENULL( "VLC initialization failed" ); + goto error; } p_new->p_libvlc_int = p_libvlc_int; - p_new->p_vlm = NULL; - p_new->p_event_manager = 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); - + var_Create( p_libvlc_int, "http-user-agent", + VLC_VAR_STRING|VLC_VAR_DOINHERIT ); return p_new; + +error: + libvlc_deinit_threads (); + free (p_new); + return NULL; } void libvlc_retain( libvlc_instance_t *p_instance ) @@ -164,29 +94,33 @@ 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->p_event_manager ) - libvlc_event_manager_release( p_instance->p_event_manager ); + 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, - 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_set_exit_handler( libvlc_instance_t *p_i, void (*cb) (void *), + void *data ) +{ + libvlc_int_t *p_libvlc = p_i->p_libvlc_int; + libvlc_SetExitHandler( p_libvlc, cb, data ); } void libvlc_wait( libvlc_instance_t *p_i ) @@ -195,10 +129,19 @@ void libvlc_wait( libvlc_instance_t *p_i ) libvlc_InternalWait( p_libvlc ); } -int libvlc_get_vlc_id( libvlc_instance_t *p_instance ) +void libvlc_set_user_agent (libvlc_instance_t *p_i, + const char *name, const char *http) { - assert( p_instance ); - return 1; + libvlc_int_t *p_libvlc = p_i->p_libvlc_int; + char *str; + + var_SetString (p_libvlc, "user-agent", name); + if ((http != NULL) + && (asprintf (&str, "%s LibVLC/"PACKAGE_VERSION, http) != -1)) + { + var_SetString (p_libvlc, "http-user-agent", str); + free (str); + } } const char * libvlc_get_version(void) @@ -217,13 +160,6 @@ const char * libvlc_get_changeset(void) 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 );