X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fcore.c;h=341f4ef2e5ca35c0c67c9d587080ad170fd44b56;hb=bf6b2d1d910e1d0837e19dbb27f3615084ead90b;hp=25fa55f79494aaddffbf43ebe8422020c2bcb956;hpb=68aa3ca3202b0f2c7e3b10db9dbe46b436b17bbd;p=vlc diff --git a/src/control/core.c b/src/control/core.c index 25fa55f794..341f4ef2e5 100644 --- a/src/control/core.c +++ b/src/control/core.c @@ -4,7 +4,7 @@ * Copyright (C) 2005 the VideoLAN team * $Id$ * - * Authors: Clément Stenac + * Authors: Clément Stenac * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,95 +18,190 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * 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 +#include + +#include +#include +#include -vlc_t * vlc_current_object( int ); +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; } -inline int libvlc_exception_raised( libvlc_exception_t *p_exception ) +void libvlc_exception_clear( libvlc_exception_t *p_exception ) { - return p_exception->b_raised; + if( NULL == p_exception ) + return; + p_exception->b_raised = 0; + libvlc_clearerr (); } -inline char* libvlc_exception_get_message( libvlc_exception_t *p_exception ) +int libvlc_exception_raised( const libvlc_exception_t *p_exception ) { - if( p_exception->b_raised == 1 && p_exception->psz_message ) - { - return p_exception->psz_message; - } - return NULL; + return (NULL != p_exception) && p_exception->b_raised; } -inline void libvlc_exception_raise( libvlc_exception_t *p_exception, - char *psz_message ) +static void libvlc_exception_not_handled( const char *psz ) { - if( p_exception == NULL ) return; - p_exception->b_raised = 1; - p_exception->psz_message = strdup( psz_message ); + 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 ) +{ + /* 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( libvlc_errmsg() ); + return; + } + + p_exception->b_raised = 1; +} -libvlc_instance_t * libvlc_new( int argc, char **argv, - libvlc_exception_t *p_exception ) +libvlc_instance_t * libvlc_new( int argc, const char *const *argv, + libvlc_exception_t *p_e ) { - int i_vlc_id; libvlc_instance_t *p_new; - vlc_t *p_vlc; + int i_ret; - i_vlc_id = VLC_Create(); - p_vlc = (vlc_t* ) vlc_current_object( i_vlc_id ); + libvlc_init_threads (); - if( !p_vlc ) + libvlc_int_t *p_libvlc_int = libvlc_InternalCreate(); + if( !p_libvlc_int ) { - libvlc_exception_raise( p_exception, "VLC initialization failed" ); - return NULL; + libvlc_deinit_threads (); + RAISENULL( "VLC initialization failed" ); } - p_new = (libvlc_instance_t *)malloc( sizeof( libvlc_instance_t ) ); + + p_new = malloc( sizeof( libvlc_instance_t ) ); + if( !p_new ) + { + libvlc_deinit_threads (); + 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 */ - if( !p_new ) + i_ret = libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ); + if( i_ret ) { - libvlc_exception_raise( p_exception, "Out of memory" ); - return NULL; + libvlc_InternalDestroy( p_libvlc_int ); + free( p_new ); + libvlc_deinit_threads (); + + if( i_ret == VLC_EEXITSUCCESS ) + return NULL; + else + RAISENULL( "VLC initialization failed" ); } - VLC_Init( i_vlc_id, argc, argv ); + 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); - p_new->p_vlc = p_vlc; - p_new->p_playlist = (playlist_t *)vlc_object_find( p_new->p_vlc, - VLC_OBJECT_PLAYLIST, FIND_CHILD ); + return p_new; +} - if( !p_new->p_playlist ) +void libvlc_retain( libvlc_instance_t *p_instance ) +{ + 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 ) +{ + vlc_mutex_t *lock = &p_instance->instance_lock; + int refs; + + vlc_mutex_lock( lock ); + assert( p_instance->ref_count > 0 ); + refs = --p_instance->ref_count; + vlc_mutex_unlock( lock ); + + if( refs == 0 ) { - libvlc_exception_raise( p_exception, "Playlist creation failed" ); - return NULL; + 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->i_vlc_id = i_vlc_id; +} - return p_new; +int libvlc_add_intf( libvlc_instance_t *p_i, const char *name ) +{ + 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; + libvlc_InternalWait( p_libvlc ); +} + +const char * libvlc_get_version(void) +{ + return VLC_Version(); +} + +const char * libvlc_get_compiler(void) +{ + return VLC_Compiler(); +} + +const char * libvlc_get_changeset(void) +{ + 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_destroy( libvlc_instance_t *p_instance ) +void libvlc_free( void *ptr ) { - if( p_instance->p_playlist ) - vlc_object_release( p_instance->p_playlist ); - vlc_object_release( p_instance->p_vlc ); - VLC_CleanUp( p_instance->i_vlc_id ); - VLC_Destroy( p_instance->i_vlc_id ); + free( ptr ); }