X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fcore.c;h=6dd84570fb99f1b1611079064fdadea7dd815c94;hb=3c69a1073a05be27d1018ed5b1ec57c065ebdc8c;hp=48614cd7e39fd49104cc7f65f252338e4bc7db30;hpb=593aeb2b2a5d78c502cc3aa1c27d9c65559e6efd;p=vlc diff --git a/src/control/core.c b/src/control/core.c index 48614cd7e3..6dd84570fb 100644 --- a/src/control/core.c +++ b/src/control/core.c @@ -20,16 +20,21 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include #include "libvlc_internal.h" #include #include +#include +#include +#include + +static const char nomemstr[] = "Insufficient memory"; + /************************************************************************* * Exceptions handling *************************************************************************/ -inline void libvlc_exception_init( libvlc_exception_t *p_exception ) +void libvlc_exception_init( libvlc_exception_t *p_exception ) { p_exception->b_raised = 0; p_exception->psz_message = NULL; @@ -37,18 +42,19 @@ inline void libvlc_exception_init( libvlc_exception_t *p_exception ) void libvlc_exception_clear( libvlc_exception_t *p_exception ) { - if( p_exception->psz_message ) + if( p_exception->psz_message != nomemstr ) free( p_exception->psz_message ); p_exception->psz_message = NULL; p_exception->b_raised = 0; } -inline int libvlc_exception_raised( libvlc_exception_t *p_exception ) +int libvlc_exception_raised( const libvlc_exception_t *p_exception ) { return (NULL != p_exception) && p_exception->b_raised; } -inline char* libvlc_exception_get_message( libvlc_exception_t *p_exception ) +const char * +libvlc_exception_get_message( const libvlc_exception_t *p_exception ) { if( p_exception->b_raised == 1 && p_exception->psz_message ) { @@ -57,29 +63,42 @@ inline char* libvlc_exception_get_message( libvlc_exception_t *p_exception ) return NULL; } -inline void libvlc_exception_raise( libvlc_exception_t *p_exception, - const char *psz_format, ... ) +void libvlc_exception_not_handled( const char *psz ) { - va_list args; - - /* does caller care about exceptions ? */ - if( p_exception == NULL ) return; + fprintf( stderr, "*** LibVLC Exception not handled: %s\nSet a breakpoint in '%s' to debug.\n", psz, __FUNCTION__ ); +} - /* remove previous exception if it wasn't cleared */ - if( p_exception->b_raised && p_exception->psz_message ) - { - free(p_exception->psz_message); - p_exception->psz_message = NULL; - } +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 ); - vasprintf( &p_exception->psz_message, psz_format, args ); + 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 ); + 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, char **argv, +libvlc_instance_t * libvlc_new( int argc, const char *const *argv, libvlc_exception_t *p_e ) { libvlc_instance_t *p_new; @@ -90,29 +109,63 @@ libvlc_instance_t * libvlc_new( int argc, char **argv, p_new = (libvlc_instance_t *)malloc( sizeof( libvlc_instance_t ) ); if( !p_new ) RAISENULL( "Out of memory" ); + 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 */ + /* Because we probably don't want a GUI by default */ - if( libvlc_InternalInit( p_libvlc_int, argc, argv ) ) + if( libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ) ) 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->ref_count = 1; 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); return p_new; } -void libvlc_destroy( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) +void libvlc_retain( libvlc_instance_t *p_instance ) { - libvlc_event_remove_all_callbacks( p_instance, p_e /* current implementation never triggers it */); - 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 ); + assert( p_instance != NULL ); + assert( p_instance->ref_count < UINT_MAX ); + + vlc_mutex_lock( &p_instance->instance_lock ); + p_instance->ref_count++; + vlc_mutex_unlock( &p_instance->instance_lock ); +} + +void libvlc_release( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) +{ + vlc_mutex_t *lock = &p_instance->instance_lock; + int refs; + + assert( p_instance->ref_count > 0 ); + + vlc_mutex_lock( lock ); + refs = --p_instance->ref_count; + if( refs == 0 ) + libvlc_event_fini( p_instance ); + vlc_mutex_unlock( lock ); + + if( refs == 0 ) + { + vlc_mutex_destroy( 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 ); + } } int libvlc_get_vlc_id( libvlc_instance_t *p_instance )