X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fcore.c;h=a0a52782361695ab19ba8142fb7e108d6d3ec50f;hb=61f0547b72d3ba80039f09064249d89fa8f2b0f7;hp=cfbc2b06a284dfbf768f8245a9889b6120b68d11;hpb=ff8e2f89378914ac7530b3edd2f3c4647dc6e9f0;p=vlc diff --git a/src/control/core.c b/src/control/core.c index cfbc2b06a2..a0a5278236 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$ @@ -20,105 +20,118 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "libvlc_internal.h" #include #include +#include -/************************************************************************* - * Exceptions handling - *************************************************************************/ -inline void libvlc_exception_init( libvlc_exception_t *p_exception ) -{ - p_exception->b_raised = 0; - p_exception->psz_message = NULL; -} +#include +#include +#include -void libvlc_exception_clear( libvlc_exception_t *p_exception ) -{ - if( p_exception->psz_message ) - free( p_exception->psz_message ); - p_exception->psz_message = NULL; - p_exception->b_raised = 0; -} +static const char nomemstr[] = "Insufficient memory"; -inline int libvlc_exception_raised( libvlc_exception_t *p_exception ) +libvlc_instance_t * libvlc_new( int argc, const char *const *argv ) { - return (NULL != p_exception) && p_exception->b_raised; -} + libvlc_instance_t *p_new = malloc (sizeof (*p_new)); + if (unlikely(p_new == NULL)) + return NULL; -inline char* libvlc_exception_get_message( libvlc_exception_t *p_exception ) -{ - if( p_exception->b_raised == 1 && p_exception->psz_message ) - { - return p_exception->psz_message; - } - return NULL; -} + libvlc_init_threads (); -inline void libvlc_exception_raise( libvlc_exception_t *p_exception, - const char *psz_format, ... ) -{ - va_list args; + 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 */ - /* does caller care about exceptions ? */ - if( p_exception == NULL ) return; + libvlc_int_t *p_libvlc_int = libvlc_InternalCreate(); + if (unlikely (p_libvlc_int == NULL)) + goto error; - /* remove previous exception if it wasn't cleared */ - if( p_exception->b_raised && p_exception->psz_message ) + if (libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv )) { - free(p_exception->psz_message); - p_exception->psz_message = NULL; + libvlc_InternalDestroy( p_libvlc_int ); + goto error; } - va_start( args, psz_format ); - vasprintf( &p_exception->psz_message, psz_format, args ); - va_end( args ); + p_new->p_libvlc_int = p_libvlc_int; + 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); + return p_new; - p_exception->b_raised = 1; +error: + libvlc_deinit_threads (); + free (p_new); + return NULL; } -libvlc_instance_t * libvlc_new( int argc, char **argv, - libvlc_exception_t *p_e ) +void libvlc_retain( libvlc_instance_t *p_instance ) { - libvlc_instance_t *p_new; + assert( p_instance != NULL ); + assert( p_instance->ref_count < UINT_MAX ); - libvlc_int_t *p_libvlc_int = libvlc_InternalCreate(); - if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" ); + vlc_mutex_lock( &p_instance->instance_lock ); + p_instance->ref_count++; + vlc_mutex_unlock( &p_instance->instance_lock ); +} - p_new = (libvlc_instance_t *)malloc( sizeof( libvlc_instance_t ) ); - if( !p_new ) RAISENULL( "Out of memory" ); +void libvlc_release( libvlc_instance_t *p_instance ) +{ + vlc_mutex_t *lock = &p_instance->instance_lock; + int refs; - /** \todo Look for interface settings. If we don't have any, add -I dummy */ - /* Because we probably don't want a GUI by default */ + vlc_mutex_lock( lock ); + assert( p_instance->ref_count > 0 ); + refs = --p_instance->ref_count; + vlc_mutex_unlock( lock ); - if( libvlc_InternalInit( p_libvlc_int, argc, argv ) ) - RAISENULL( "VLC initialization failed" ); + if( refs == 0 ) + { + vlc_mutex_destroy( 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 (); + } +} - p_new->p_libvlc_int = p_libvlc_int; - p_new->p_vlm = NULL; - p_new->b_playlist_locked = 0; - p_new->p_callback_list = NULL; - vlc_mutex_init(p_libvlc_int, &p_new->instance_lock); - vlc_mutex_init(p_libvlc_int, &p_new->event_callback_lock); - - libvlc_event_init(p_new, p_e); +int libvlc_add_intf( libvlc_instance_t *p_i, const char *name ) +{ + return libvlc_InternalAddIntf( p_i->p_libvlc_int, name ) ? -1 : 0; +} - return p_new; +void libvlc_wait( libvlc_instance_t *p_i ) +{ + libvlc_int_t *p_libvlc = p_i->p_libvlc_int; + libvlc_InternalWait( p_libvlc ); +} + +const char * libvlc_get_version(void) +{ + return VLC_Version(); } -void libvlc_destroy( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) +const char * libvlc_get_compiler(void) { - libvlc_event_fini( p_instance, p_e ); - vlc_mutex_destroy( &p_instance->instance_lock ); - vlc_mutex_destroy( &p_instance->event_callback_lock); - libvlc_InternalCleanup( p_instance->p_libvlc_int ); - libvlc_InternalDestroy( p_instance->p_libvlc_int, VLC_FALSE ); - free( p_instance ); + return VLC_Compiler(); } -int libvlc_get_vlc_id( libvlc_instance_t *p_instance ) +const char * libvlc_get_changeset(void) { - return p_instance->p_libvlc_int->i_object_id; + extern const char psz_vlc_changeset[]; + return psz_vlc_changeset; }