]> git.sesse.net Git - vlc/blobdiff - src/control/core.c
Revert "Remove libvlc_free"
[vlc] / src / control / core.c
index a079e2e6bfb6e4c9cdfe4394341d4d0084376994..745c85af64a27b39ec8986d25912684ba8a73cff 100644 (file)
@@ -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$
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-#include <stdarg.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "libvlc_internal.h"
 #include <vlc/libvlc.h>
 
 #include <vlc_interface.h>
+#include <vlc_vlm.h>
+
+#include <stdarg.h>
+#include <limits.h>
+#include <assert.h>
 
 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;
-    p_exception->psz_message = NULL;
-}
+    libvlc_instance_t *p_new = malloc (sizeof (*p_new));
+    if (unlikely(p_new == NULL))
+        return NULL;
 
-void libvlc_exception_clear( libvlc_exception_t *p_exception )
-{
-    if( p_exception->psz_message != nomemstr )
-        free( p_exception->psz_message );
-    p_exception->psz_message = NULL;
-    p_exception->b_raised = 0;
-}
+    libvlc_init_threads ();
 
-int libvlc_exception_raised( const libvlc_exception_t *p_exception )
-{
-    return (NULL != p_exception) && p_exception->b_raised;
-}
+    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 */
 
-const char *
-libvlc_exception_get_message( const libvlc_exception_t *p_exception )
-{
-    if( p_exception->b_raised == 1 && p_exception->psz_message )
+    libvlc_int_t *p_libvlc_int = libvlc_InternalCreate();
+    if (unlikely (p_libvlc_int == NULL))
+        goto error;
+
+    if (libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ))
     {
-        return p_exception->psz_message;
+        libvlc_InternalDestroy( p_libvlc_int );
+        goto error;
     }
+
+    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);
+    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_exception_raise( libvlc_exception_t *p_exception,
-                                           const char *psz_format, ... )
+void libvlc_retain( libvlc_instance_t *p_instance )
 {
-    va_list args;
+    assert( p_instance != NULL );
+    assert( p_instance->ref_count < UINT_MAX );
 
-    /* does caller care about exceptions ? */
-    if( p_exception == NULL ) return;
+    vlc_mutex_lock( &p_instance->instance_lock );
+    p_instance->ref_count++;
+    vlc_mutex_unlock( &p_instance->instance_lock );
+}
 
-    /* remove previous exception if it wasn't cleared */
-    libvlc_exception_clear( p_exception );
+void libvlc_release( libvlc_instance_t *p_instance )
+{
+    vlc_mutex_t *lock = &p_instance->instance_lock;
+    int refs;
 
-    va_start( args, psz_format );
-    if( vasprintf( &p_exception->psz_message, psz_format, args ) == -1)
-        p_exception->psz_message = (char *)nomemstr;
-    va_end( args );
+    vlc_mutex_lock( lock );
+    assert( p_instance->ref_count > 0 );
+    refs = --p_instance->ref_count;
+    vlc_mutex_unlock( lock );
 
-    p_exception->b_raised = 1;
+    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 ();
+    }
 }
 
-libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
-                                libvlc_exception_t *p_e )
+int libvlc_add_intf( libvlc_instance_t *p_i, const char *name )
 {
-    libvlc_instance_t *p_new;
+    return libvlc_InternalAddIntf( p_i->p_libvlc_int, name ) ? -1 : 0;
+}
 
-    libvlc_int_t *p_libvlc_int = libvlc_InternalCreate();
-    if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" );
+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 );
+}
 
-    p_new = (libvlc_instance_t *)malloc( sizeof( libvlc_instance_t ) );
-    if( !p_new ) RAISENULL( "Out of memory" );
+void libvlc_wait( libvlc_instance_t *p_i )
+{
+    libvlc_int_t *p_libvlc = p_i->p_libvlc_int;
+    libvlc_InternalWait( p_libvlc );
+}
 
-    /** \todo Look for interface settings. If we don't have any, add -I dummy */
-    /* Because we probably don't want a GUI by default */
+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;
 
-    if( libvlc_InternalInit( p_libvlc_int, argc, argv ) )
-        RAISENULL( "VLC initialization failed" );
+    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);
+    }
+}
 
-    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);
+const char * libvlc_get_version(void)
+{
+    return VLC_Version();
+}
 
-    return p_new;
+const char * libvlc_get_compiler(void)
+{
+    return VLC_Compiler();
 }
 
-void libvlc_destroy( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
+const char * libvlc_get_changeset(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 );
+    extern const char psz_vlc_changeset[];
+    return psz_vlc_changeset;
 }
 
-int libvlc_get_vlc_id( libvlc_instance_t *p_instance )
+void libvlc_free( void *ptr )
 {
-    return p_instance->p_libvlc_int->i_object_id;
+    free( ptr );
 }