/*****************************************************************************
- * 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$
static const char nomemstr[] = "Insufficient memory";
-/*************************************************************************
- * Exceptions handling
- *************************************************************************/
-void libvlc_exception_init( libvlc_exception_t *p_exception )
+libvlc_instance_t * libvlc_new( int argc, const char *const *argv )
{
- p_exception->b_raised = 0;
-}
-
-void libvlc_exception_clear( libvlc_exception_t *p_exception )
-{
- if( NULL == p_exception )
- return;
- p_exception->b_raised = 0;
- libvlc_clearerr ();
-}
-
-int libvlc_exception_raised( const libvlc_exception_t *p_exception )
-{
- return (NULL != p_exception) && p_exception->b_raised;
-}
-
-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, ... )
-{
- va_list args;
-
- /* Make sure that there is no unnoticed previous exception */
- if( p_exception && p_exception->b_raised )
- {
- libvlc_exception_not_handled( libvlc_errmsg() );
- libvlc_exception_clear( p_exception );
- }
-
- /* Unformat-ize the message */
- va_start( args, psz_format );
- libvlc_vprinterr( psz_format, args );
- 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( libvlc_errmsg() );
- return;
- }
-
- p_exception->b_raised = 1;
-}
-
-libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
- libvlc_exception_t *p_e )
-{
- libvlc_instance_t *p_new;
- int i_ret;
+ libvlc_instance_t *p_new = malloc (sizeof (*p_new));
+ if (unlikely(p_new == NULL))
+ return NULL;
libvlc_init_threads ();
- libvlc_int_t *p_libvlc_int = libvlc_InternalCreate();
- if( !p_libvlc_int )
- {
- libvlc_deinit_threads ();
- RAISENULL( "VLC initialization failed" );
- }
-
- 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 */
+ 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 );
- libvlc_deinit_threads ();
-
- if( i_ret == VLC_EEXITSUCCESS )
- return NULL;
- else
- RAISENULL( "VLC initialization failed" );
+ goto error;
}
p_new->p_libvlc_int = p_libvlc_int;
p_new->verbosity = 1;
p_new->p_callback_list = NULL;
vlc_mutex_init(&p_new->instance_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 )
}
}
-int 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 ) )
- {
- libvlc_exception_raise( p_e, "Interface initialization failed" );
- return -1;
- }
- return 0;
+ 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 )
libvlc_InternalWait( p_libvlc );
}
+void libvlc_set_user_agent (libvlc_instance_t *p_i,
+ const char *name, const char *http)
+{
+ 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)
{
return VLC_Version();
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 );
projects / vlc / blobdiff