Split libvlc.c:

* instances creation/deletion stuff to libvlc-common.c
* implementation of the old libvlc API to libvlc.c

include/libvlc_internal.h

@@ -31,6 +31,21 @@ extern "C" {
 
 #include <vlc/vlc.h>
 
+/***************************************************************************
+ * Internal creation and destruction functions
+ ***************************************************************************/
+libvlc_int_t *libvlc_InternalCreate();
+int libvlc_InternalInit( libvlc_int_t *, int, char *ppsz_argv[] );
+int libvlc_InternalCleanup( libvlc_int_t * );
+int libvlc_InternalDestroy( libvlc_int_t *, vlc_bool_t );
+
+int libvlc_InternalAddIntf( libvlc_int_t *, char const *, vlc_bool_t,
+                            vlc_bool_t, int, char ** );
+
+/***************************************************************************
+ * Opaque structures for libvlc API
+ ***************************************************************************/
+
 struct libvlc_instance_t
 {
     libvlc_int_t *p_libvlc_int;

src/Makefile.am

@@ -252,6 +252,7 @@ SOURCES_libvlc_getopt = \
 
 SOURCES_libvlc_common = \
 	libvlc.c \
+	libvlc-common.c \
 	libvlc.h \
 	interface/interface.c \
 	interface/intf_eject.c \

src/libvlc-common.c

+/*****************************************************************************
+ * libvlc-common.c: libvlc instances creation and deletion
+ *****************************************************************************
+ * Copyright (C) 1998-2006 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
+ *          Samuel Hocevar <sam@zoy.org>
+ *          Gildas Bazin <gbazin@videolan.org>
+ *          Derk-Jan Hartman <hartman at videolan dot org>
+ *          Rémi Denis-Courmont <rem # videolan : org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+/** \file
+ * This file contains functions to create and destroy libvlc instances
+ */
+
+/*****************************************************************************
+ * Pretend we are a builtin module
+ *****************************************************************************/
+#define MODULE_NAME main
+#define MODULE_PATH main
+#define __BUILTIN__
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <vlc/vlc.h>
+#include <libvlc_internal.h>
+#include <vlc/input.h>
+
+#include <errno.h>                                                 /* ENOMEM */
+#include <stdio.h>                                              /* sprintf() */
+#include <string.h>                                            /* strerror() */
+#include <stdlib.h>                                                /* free() */
+
+#ifndef WIN32
+#   include <netinet/in.h>                            /* BSD: struct in_addr */
+#endif
+
+#ifdef HAVE_UNISTD_H
+#   include <unistd.h>
+#elif defined( WIN32 ) && !defined( UNDER_CE )
+#   include <io.h>
+#endif
+
+#ifdef WIN32                       /* optind, getopt(), included in unistd.h */
+#   include "extras/getopt.h"
+#endif
+
+#ifdef HAVE_LOCALE_H
+#   include <locale.h>
+#endif
+
+#ifdef HAVE_HAL
+#   include <hal/libhal.h>
+#endif
+
+#include "vlc_cpu.h"                                        /* CPU detection */
+#include "os_specific.h"
+
+#include "vlc_error.h"
+
+#include "vlc_playlist.h"
+#include "vlc_interface.h"
+
+#include "audio_output.h"
+
+#include "vlc_video.h"
+#include "video_output.h"
+
+#include "stream_output.h"
+#include "charset.h"
+
+#include "libvlc.h"
+
+/*****************************************************************************
+ * The evil global variable. We handle it with care, don't worry.
+ *****************************************************************************/
+static libvlc_global_data_t   libvlc_global;
+static libvlc_global_data_t * p_libvlc_global;
+static libvlc_int_t *    p_static_vlc;
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+void LocaleInit( vlc_object_t * );
+void LocaleDeinit( void );
+static void SetLanguage   ( char const * );
+static int  GetFilenames  ( libvlc_int_t *, int, char *[] );
+static void Help          ( libvlc_int_t *, char const *psz_help_name );
+static void Usage         ( libvlc_int_t *, char const *psz_module_name );
+static void ListModules   ( libvlc_int_t * );
+static void Version       ( void );
+
+#ifdef WIN32
+static void ShowConsole   ( vlc_bool_t );
+static void PauseConsole  ( void );
+#endif
+static int  ConsoleWidth  ( void );
+
+static int  VerboseCallback( vlc_object_t *, char const *,
+                             vlc_value_t, vlc_value_t, void * );
+
+static void InitDeviceValues( libvlc_int_t * );
+
+/*****************************************************************************
+ * vlc_current_object: return the current object.
+ *****************************************************************************
+ * If i_object is non-zero, return the corresponding object. Otherwise,
+ * return the statically allocated p_vlc object.
+ *****************************************************************************/
+libvlc_int_t * vlc_current_object( int i_object )
+{
+    if( i_object )
+    {
+         return vlc_object_get( p_libvlc_global, i_object );
+    }
+
+    return p_static_vlc;
+}
+
+
+/**
+ * Allocate a libvlc instance, initialize global data if needed
+ * It also initializes the threading system
+ */
+libvlc_int_t * libvlc_InternalCreate( void )
+{
+    int i_ret;
+    libvlc_int_t * p_libvlc = NULL;
+    vlc_value_t lockval;
+
+    /* &libvlc_global never changes,
+     * so we can safely call this multiple times. */
+    p_libvlc_global = &libvlc_global;
+
+    /* vlc_threads_init *must* be the first internal call! No other call is
+     * allowed before the thread system has been initialized. */
+    i_ret = vlc_threads_init( p_libvlc_global );
+    if( i_ret < 0 ) return NULL;
+
+    /* Now that the thread system is initialized, we don't have much, but
+     * at least we have var_Create */
+    var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
+    var_Get( p_libvlc_global, "libvlc", &lockval );
+    vlc_mutex_lock( lockval.p_address );
+    if( !libvlc_global.b_ready )
+    {
+        char *psz_env;
+
+        /* Guess what CPU we have */
+        libvlc_global.i_cpu = CPUCapabilities();
+
+        /* Find verbosity from VLC_VERBOSE environment variable */
+        psz_env = getenv( "VLC_VERBOSE" );
+        libvlc_global.i_verbose = psz_env ? atoi( psz_env ) : -1;
+
+#if defined( HAVE_ISATTY ) && !defined( WIN32 )
+        libvlc_global.b_color = isatty( 2 ); /* 2 is for stderr */
+#else
+        libvlc_global.b_color = VLC_FALSE;
+#endif
+
+        /* Initialize message queue */
+        msg_Create( p_libvlc_global );
+
+        /* Announce who we are */
+        msg_Dbg( p_libvlc_global, COPYRIGHT_MESSAGE );
+        msg_Dbg( p_libvlc_global, "libvlc was configured with %s",
+                                CONFIGURE_LINE );
+
+        /* The module bank will be initialized later */
+        libvlc_global.p_module_bank = NULL;
+
+        libvlc_global.b_ready = VLC_TRUE;
+    }
+    vlc_mutex_unlock( lockval.p_address );
+    var_Destroy( p_libvlc_global, "libvlc" );
+
+    /* Allocate a libvlc instance object */
+    p_libvlc = vlc_object_create( p_libvlc_global, VLC_OBJECT_LIBVLC );
+    if( p_libvlc == NULL ) return NULL;
+    p_libvlc->thread_id = 0;
+    p_libvlc->p_playlist = NULL;
+    p_libvlc->psz_object_name = "libvlc";
+
+    /* Initialize mutexes */
+    vlc_mutex_init( p_libvlc, &p_libvlc->config_lock );
+#ifdef __APPLE__
+    vlc_mutex_init( p_libvlc, &p_libvlc->quicktime_lock );
+    vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW );
+#endif
+
+    /* Store our newly allocated structure in the global list */
+    vlc_object_attach( p_libvlc, p_libvlc_global );
+
+    /* Store data for the non-reentrant API */
+    p_static_vlc = p_libvlc;
+
+    return p_libvlc;
+}
+
+/**
+ * Initialize a libvlc instance
+ * This function initializes a previously allocated libvlc instance:
+ *  - CPU detection
+ *  - gettext initialization
+ *  - message queue, module bank and playlist initialization
+ *  - configuration and commandline parsing
+ */
+int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
+{
+    char         p_capabilities[200];
+    char *       p_tmp;
+    char *       psz_modules;
+    char *       psz_parser;
+    char *       psz_control;
+    vlc_bool_t   b_exit = VLC_FALSE;
+    int          i_ret = VLC_EEXIT;
+    module_t    *p_help_module;
+    playlist_t  *p_playlist;
+    vlc_value_t  val;
+#if defined( ENABLE_NLS ) \
+     && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
+# if defined (WIN32) || defined (__APPLE__)
+    char *       psz_language;
+#endif
+#endif
+
+    /* System specific initialization code */
+    system_Init( p_libvlc, &i_argc, ppsz_argv );
+
+    /* Get the executable name (similar to the basename command) */
+    if( i_argc > 0 )
+    {
+        p_libvlc->psz_object_name = p_tmp = ppsz_argv[ 0 ];
+        while( *p_tmp )
+        {
+            if( *p_tmp == '/' ) p_libvlc->psz_object_name = ++p_tmp;
+            else ++p_tmp;
+        }
+    }
+    else
+    {
+        p_libvlc->psz_object_name = "vlc";
+    }
+
+    /*
+     * Support for gettext
+     */
+    SetLanguage( "" );
+
+    /*
+     * Global iconv, must be done after setlocale()
+     * so that vlc_current_charset() works.
+     */
+    LocaleInit( (vlc_object_t *)p_libvlc );
+
+    /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
+    msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
+
+    /* Initialize the module bank and load the configuration of the
+     * main module. We need to do this at this stage to be able to display
+     * a short help if required by the user. (short help == main module
+     * options) */
+    module_InitBank( p_libvlc );
+
+    /* Hack: insert the help module here */
+    p_help_module = vlc_object_create( p_libvlc, VLC_OBJECT_MODULE );
+    if( p_help_module == NULL )
+    {
+        module_EndBank( p_libvlc );
+        return VLC_EGENERIC;
+    }
+    p_help_module->psz_object_name = "help";
+    p_help_module->psz_longname = N_("Help options");
+    config_Duplicate( p_help_module, p_help_config );
+    vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
+    /* End hack */
+
+    if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ) )
+    {
+        vlc_object_detach( p_help_module );
+        config_Free( p_help_module );
+        vlc_object_destroy( p_help_module );
+        module_EndBank( p_libvlc );
+        return VLC_EGENERIC;
+    }
+
+    /* Check for short help option */
+    if( config_GetInt( p_libvlc, "help" ) )
+    {
+        Help( p_libvlc, "help" );
+        b_exit = VLC_TRUE;
+        i_ret = VLC_EEXITSUCCESS;
+    }
+    /* Check for version option */
+    else if( config_GetInt( p_libvlc, "version" ) )
+    {
+        Version();
+        b_exit = VLC_TRUE;
+        i_ret = VLC_EEXITSUCCESS;
+    }
+
+    /* Set the config file stuff */
+    p_libvlc->psz_homedir = config_GetHomeDir();
+    p_libvlc->psz_userdir = config_GetUserDir();
+    if( p_libvlc->psz_userdir == NULL )
+        p_libvlc->psz_userdir = strdup(p_libvlc->psz_homedir);
+    p_libvlc->psz_configfile = config_GetPsz( p_libvlc, "config" );
+    if( p_libvlc->psz_configfile != NULL && p_libvlc->psz_configfile[0] == '~'
+         && p_libvlc->psz_configfile[1] == '/' )
+    {
+        char *psz = malloc( strlen(p_libvlc->psz_userdir)
+                             + strlen(p_libvlc->psz_configfile) );
+        /* This is incomplete : we should also support the ~cmassiot/ syntax. */
+        sprintf( psz, "%s/%s", p_libvlc->psz_userdir,
+                               p_libvlc->psz_configfile + 2 );
+        free( p_libvlc->psz_configfile );
+        p_libvlc->psz_configfile = psz;
+    }
+
+    /* Check for plugins cache options */
+    if( config_GetInt( p_libvlc, "reset-plugins-cache" ) )
+    {
+        libvlc_global.p_module_bank->b_cache_delete = VLC_TRUE;
+    }
+
+    /* Hack: remove the help module here */
+    vlc_object_detach( p_help_module );
+    /* End hack */
+
+    /* Will be re-done properly later on */
+    p_libvlc->p_libvlc_global->i_verbose = config_GetInt( p_libvlc, "verbose" );
+
+    /* Check for daemon mode */
+#ifndef WIN32
+    if( config_GetInt( p_libvlc, "daemon" ) )
+    {
+#if HAVE_DAEMON
+        if( daemon( 1, 0) != 0 )
+        {
+            msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" );
+            b_exit = VLC_TRUE;
+        }
+
+        p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE;
+
+        /* lets check if we need to write the pidfile */
+        char * psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
+
+        if( psz_pidfile != NULL )
+        {
+            FILE *pidfile;
+            pid_t i_pid = getpid ();
+            msg_Dbg( p_libvlc, "PID is %d, writing it to %s",
+                               i_pid, psz_pidfile );
+            pidfile = utf8_fopen( psz_pidfile,"w" );
+            if( pidfile != NULL )
+            {
+                utf8_fprintf( pidfile, "%d", (int)i_pid );
+                fclose( pidfile );
+            }
+            else
+            {
+                msg_Err( p_libvlc, "cannot open pid file for writing: %s (%s)",
+                         psz_pidfile, strerror(errno) );
+            }
+        }
+        free( psz_pidfile );
+
+#else
+        pid_t i_pid;
+
+        if( ( i_pid = fork() ) < 0 )
+        {
+            msg_Err( p_libvlc, "unable to fork vlc to daemon mode" );
+            b_exit = VLC_TRUE;
+        }
+        else if( i_pid )
+        {
+            /* This is the parent, exit right now */
+            msg_Dbg( p_libvlc, "closing parent process" );
+            b_exit = VLC_TRUE;
+            i_ret = VLC_EEXITSUCCESS;
+        }
+        else
+        {
+            /* We are the child */
+            msg_Dbg( p_libvlc, "daemon spawned" );
+            close( STDIN_FILENO );
+            close( STDOUT_FILENO );
+            close( STDERR_FILENO );
+
+            p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE;
+        }
+#endif
+    }
+#endif
+
+    if( b_exit )
+    {
+        config_Free( p_help_module );
+        vlc_object_destroy( p_help_module );
+        module_EndBank( p_libvlc );
+        return i_ret;
+    }
+
+    /* Check for translation config option */
+#if defined( ENABLE_NLS ) \
+     && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
+# if defined (WIN32) || defined (__APPLE__)
+    /* This ain't really nice to have to reload the config here but it seems
+     * the only way to do it. */
+    config_LoadConfigFile( p_libvlc, "main" );
+    config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
+
+    /* Check if the user specified a custom language */
+    psz_language = config_GetPsz( p_libvlc, "language" );
+    if( psz_language && *psz_language && strcmp( psz_language, "auto" ) )
+    {
+        vlc_bool_t b_cache_delete = libvlc_global.p_module_bank->b_cache_delete;
+
+        /* Reset the default domain */
+        SetLanguage( psz_language );
+
+        /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
+        msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
+
+        module_EndBank( p_libvlc );
+        module_InitBank( p_libvlc );
+        config_LoadConfigFile( p_libvlc, "main" );
+        config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
+        libvlc_global.p_module_bank->b_cache_delete = b_cache_delete;
+    }
+    if( psz_language ) free( psz_language );
+# endif
+#endif
+
+    /*
+     * Load the builtins and plugins into the module_bank.
+     * We have to do it before config_Load*() because this also gets the
+     * list of configuration options exported by each module and loads their
+     * default values.
+     */
+    module_LoadBuiltins( p_libvlc );
+    module_LoadPlugins( p_libvlc );
+    if( p_libvlc->b_die )
+    {
+        b_exit = VLC_TRUE;
+    }
+
+    msg_Dbg( p_libvlc, "module bank initialized, found %i modules",
+                    libvlc_global.p_module_bank->i_children );
+
+    /* Hack: insert the help module here */
+    vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
+    /* End hack */
+
+    /* Check for help on modules */
+    if( (p_tmp = config_GetPsz( p_libvlc, "module" )) )
+    {
+        Help( p_libvlc, p_tmp );
+        free( p_tmp );
+        b_exit = VLC_TRUE;
+        i_ret = VLC_EEXITSUCCESS;
+    }
+    /* Check for long help option */
+    else if( config_GetInt( p_libvlc, "longhelp" ) )
+    {
+        Help( p_libvlc, "longhelp" );
+        b_exit = VLC_TRUE;
+        i_ret = VLC_EEXITSUCCESS;
+    }
+    /* Check for module list option */
+    else if( config_GetInt( p_libvlc, "list" ) )
+    {
+        ListModules( p_libvlc );
+        b_exit = VLC_TRUE;
+        i_ret = VLC_EEXITSUCCESS;
+    }
+
+    /* Check for config file options */
+    if( config_GetInt( p_libvlc, "reset-config" ) )
+    {
+        vlc_object_detach( p_help_module );
+        config_ResetAll( p_libvlc );
+        config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
+        config_SaveConfigFile( p_libvlc, NULL );
+        vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
+    }
+    if( config_GetInt( p_libvlc, "save-config" ) )
+    {
+        vlc_object_detach( p_help_module );
+        config_LoadConfigFile( p_libvlc, NULL );
+        config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
+        config_SaveConfigFile( p_libvlc, NULL );
+        vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
+    }
+
+    /* Hack: remove the help module here */
+    vlc_object_detach( p_help_module );
+    /* End hack */
+
+    if( b_exit )
+    {
+        config_Free( p_help_module );
+        vlc_object_destroy( p_help_module );
+        module_EndBank( p_libvlc );
+        return i_ret;
+    }
+
+    /*
+     * Init device values
+     */
+    InitDeviceValues( p_libvlc );
+
+    /*
+     * Override default configuration with config file settings
+     */
+    config_LoadConfigFile( p_libvlc, NULL );
+
+    /* Hack: insert the help module here */
+    vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
+    /* End hack */
+
+    /*
+     * Override configuration with command line settings
+     */
+    if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_FALSE ) )
+    {
+#ifdef WIN32
+        ShowConsole( VLC_FALSE );
+        /* Pause the console because it's destroyed when we exit */
+        fprintf( stderr, "The command line options couldn't be loaded, check "
+                 "that they are valid.\n" );
+        PauseConsole();
+#endif
+        vlc_object_detach( p_help_module );
+        config_Free( p_help_module );
+        vlc_object_destroy( p_help_module );
+        module_EndBank( p_libvlc );
+        return VLC_EGENERIC;
+    }
+
+    /* Hack: remove the help module here */
+    vlc_object_detach( p_help_module );
+    config_Free( p_help_module );
+    vlc_object_destroy( p_help_module );
+    /* End hack */
+
+    /*
+     * System specific configuration
+     */
+    system_Configure( p_libvlc, &i_argc, ppsz_argv );
+
+    /*
+     * Message queue options
+     */
+
+    var_Create( p_libvlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    if( config_GetInt( p_libvlc, "quiet" ) )
+    {
+        val.i_int = -1;
+        var_Set( p_libvlc, "verbose", val );
+    }
+    var_AddCallback( p_libvlc, "verbose", VerboseCallback, NULL );
+    var_Change( p_libvlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL );
+
+    libvlc_global.b_color = libvlc_global.b_color && 
+                                config_GetInt( p_libvlc, "color" );
+
+    /*
+     * Output messages that may still be in the queue
+     */
+    msg_Flush( p_libvlc );
+
+    /* p_libvlc initialization. FIXME ? */
+
+    if( !config_GetInt( p_libvlc, "fpu" ) )
+        libvlc_global.i_cpu &= ~CPU_CAPABILITY_FPU;
+
+#if defined( __i386__ ) || defined( __x86_64__ )
+    if( !config_GetInt( p_libvlc, "mmx" ) )
+        libvlc_global.i_cpu &= ~CPU_CAPABILITY_MMX;
+    if( !config_GetInt( p_libvlc, "3dn" ) )
+        libvlc_global.i_cpu &= ~CPU_CAPABILITY_3DNOW;
+    if( !config_GetInt( p_libvlc, "mmxext" ) )
+        libvlc_global.i_cpu &= ~CPU_CAPABILITY_MMXEXT;
+    if( !config_GetInt( p_libvlc, "sse" ) )
+        libvlc_global.i_cpu &= ~CPU_CAPABILITY_SSE;
+    if( !config_GetInt( p_libvlc, "sse2" ) )
+        libvlc_global.i_cpu &= ~CPU_CAPABILITY_SSE2;
+#endif
+#if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
+    if( !config_GetInt( p_libvlc, "altivec" ) )
+        libvlc_global.i_cpu &= ~CPU_CAPABILITY_ALTIVEC;
+#endif
+
+#define PRINT_CAPABILITY( capability, string )                              \
+    if( libvlc_global.i_cpu & capability )                                         \
+    {                                                                       \
+        strncat( p_capabilities, string " ",                                \
+                 sizeof(p_capabilities) - strlen(p_capabilities) );         \
+        p_capabilities[sizeof(p_capabilities) - 1] = '\0';                  \
+    }
+
+    p_capabilities[0] = '\0';
+    PRINT_CAPABILITY( CPU_CAPABILITY_486, "486" );
+    PRINT_CAPABILITY( CPU_CAPABILITY_586, "586" );
+    PRINT_CAPABILITY( CPU_CAPABILITY_PPRO, "Pentium Pro" );
+    PRINT_CAPABILITY( CPU_CAPABILITY_MMX, "MMX" );
+    PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" );
+    PRINT_CAPABILITY( CPU_CAPABILITY_MMXEXT, "MMXEXT" );
+    PRINT_CAPABILITY( CPU_CAPABILITY_SSE, "SSE" );
+    PRINT_CAPABILITY( CPU_CAPABILITY_SSE2, "SSE2" );
+    PRINT_CAPABILITY( CPU_CAPABILITY_ALTIVEC, "AltiVec" );
+    PRINT_CAPABILITY( CPU_CAPABILITY_FPU, "FPU" );
+    msg_Dbg( p_libvlc, "CPU has capabilities %s", p_capabilities );
+
+    /*
+     * Choose the best memcpy module
+     */
+    p_libvlc->p_memcpy_module = module_Need( p_libvlc, "memcpy", "$memcpy", 0 );
+
+    if( p_libvlc->pf_memcpy == NULL )
+    {
+        p_libvlc->pf_memcpy = memcpy;
+    }
+
+    if( p_libvlc->pf_memset == NULL )
+    {
+        p_libvlc->pf_memset = memset;
+    }
+
+    p_libvlc->b_stats = config_GetInt( p_libvlc, "stats" );
+    p_libvlc->i_timers = 0;
+    p_libvlc->pp_timers = NULL;
+    vlc_mutex_init( p_libvlc, &p_libvlc->timer_lock );
+
+    /*
+     * Initialize hotkey handling
+     */
+    var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER );
+    p_libvlc->p_hotkeys = malloc( sizeof(p_hotkeys) );
+    /* Do a copy (we don't need to modify the strings) */
+    memcpy( p_libvlc->p_hotkeys, p_hotkeys, sizeof(p_hotkeys) );
+
+    /* Initialize playlist and get commandline files */
+    playlist_ThreadCreate( p_libvlc );
+    if( !p_libvlc->p_playlist )
+    {
+        msg_Err( p_libvlc, "playlist initialization failed" );
+        if( p_libvlc->p_memcpy_module != NULL )
+        {
+            module_Unneed( p_libvlc, p_libvlc->p_memcpy_module );
+        }
+        module_EndBank( p_libvlc );
+        return VLC_EGENERIC;
+    }
+    p_playlist = p_libvlc->p_playlist;
+
+    psz_modules = config_GetPsz( p_playlist, "services-discovery" );
+    if( psz_modules && *psz_modules )
+    {
+        /* Add service discovery modules */
+        playlist_AddSDModules( p_playlist, psz_modules );
+    }
+    if( psz_modules ) free( psz_modules );
+
+    /*
+     * Load background interfaces
+     */
+    psz_modules = config_GetPsz( p_libvlc, "extraintf" );
+    psz_control = config_GetPsz( p_libvlc, "control" );
+
+    if( psz_modules && *psz_modules && psz_control && *psz_control )
+    {
+        psz_modules = (char *)realloc( psz_modules, strlen( psz_modules ) +
+                                                    strlen( psz_control ) + 1 );
+        sprintf( psz_modules, "%s:%s", psz_modules, psz_control );
+    }
+    else if( psz_control && *psz_control )
+    {
+        if( psz_modules ) free( psz_modules );
+        psz_modules = strdup( psz_control );
+    }
+
+    psz_parser = psz_modules;
+    while ( psz_parser && *psz_parser )
+    {
+        char *psz_module, *psz_temp;
+        psz_module = psz_parser;
+        psz_parser = strchr( psz_module, ':' );
+        if ( psz_parser )
+        {
+            *psz_parser = '\0';
+            psz_parser++;
+        }
+        psz_temp = (char *)malloc( strlen(psz_module) + sizeof(",none") );
+        if( psz_temp )
+        {
+            sprintf( psz_temp, "%s,none", psz_module );
+            VLC_AddIntf( 0, psz_temp, VLC_FALSE, VLC_FALSE );
+            free( psz_temp );
+        }
+    }
+    if ( psz_modules )
+    {
+        free( psz_modules );
+    }
+
+    /*
+     * Always load the hotkeys interface if it exists
+     */
+    VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE, VLC_FALSE );
+
+    /*
+     * If needed, load the Xscreensaver interface
+     * Currently, only for X
+     */
+#ifdef HAVE_X11_XLIB_H
+    if( config_GetInt( p_libvlc, "disable-screensaver" ) == 1 )
+    {
+        VLC_AddIntf( 0, "screensaver,none", VLC_FALSE, VLC_FALSE );
+    }
+#endif
+
+    if( config_GetInt( p_libvlc, "file-logging" ) == 1 )
+    {
+        VLC_AddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE );
+    }
+#ifdef HAVE_SYSLOG_H
+    if( config_GetInt( p_libvlc, "syslog" ) == 1 )
+    {
+        char *psz_logmode = "logmode=syslog";
+        libvlc_InternalAddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE,
+                                1, &psz_logmode );
+    }
+#endif
+
+    if( config_GetInt( p_libvlc, "show-intf" ) == 1 )
+    {
+        VLC_AddIntf( 0, "showintf,none", VLC_FALSE, VLC_FALSE );
+    }
+
+    if( config_GetInt( p_libvlc, "network-synchronisation") == 1 )
+    {
+        VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE );
+    }
+
+    /*
+     * FIXME: kludge to use a p_libvlc-local variable for the Mozilla plugin
+     */
+    var_Create( p_libvlc, "drawable", VLC_VAR_INTEGER );
+    var_Create( p_libvlc, "drawable-view-top", VLC_VAR_INTEGER );
+    var_Create( p_libvlc, "drawable-view-left", VLC_VAR_INTEGER );
+    var_Create( p_libvlc, "drawable-view-bottom", VLC_VAR_INTEGER );
+    var_Create( p_libvlc, "drawable-view-right", VLC_VAR_INTEGER );
+    var_Create( p_libvlc, "drawable-clip-top", VLC_VAR_INTEGER );
+    var_Create( p_libvlc, "drawable-clip-left", VLC_VAR_INTEGER );
+    var_Create( p_libvlc, "drawable-clip-bottom", VLC_VAR_INTEGER );
+    var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER );
+
+    /* Create volume callback system. */
+    var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
+
+    /*
+     * Get input filenames given as commandline arguments
+     */
+    GetFilenames( p_libvlc, i_argc, ppsz_argv );
+
+    /*
+     * Get --open argument
+     */
+    var_Create( p_libvlc, "open", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+    var_Get( p_libvlc, "open", &val );
+    if ( val.psz_string != NULL && *val.psz_string )
+    {
+        VLC_AddTarget( p_libvlc->i_object_id, val.psz_string, NULL, 0,
+                       PLAYLIST_INSERT, 0 );
+    }
+    if ( val.psz_string != NULL ) free( val.psz_string );
+
+    return VLC_SUCCESS;
+}
+
+/**
+ * Cleanup a libvlc instance. The instance is not completely deallocated
+ * \param p_libvlc the instance to clean
+ */
+int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
+{
+    intf_thread_t      * p_intf;
+    vout_thread_t      * p_vout;
+    aout_instance_t    * p_aout;
+    announce_handler_t * p_announce;
+
+    /* Ask the interfaces to stop and destroy them */
+    msg_Dbg( p_libvlc, "removing all interfaces" );
+    while( (p_intf = vlc_object_find( p_libvlc, VLC_OBJECT_INTF, FIND_CHILD )) )
+    {
+        intf_StopThread( p_intf );
+        vlc_object_detach( p_intf );
+        vlc_object_release( p_intf );
+        intf_Destroy( p_intf );
+    }
+
+    /* Free playlist */
+    msg_Dbg( p_libvlc, "removing playlist" );
+    playlist_ThreadDestroy( p_libvlc->p_playlist );
+
+    /* Free video outputs */
+    msg_Dbg( p_libvlc, "removing all video outputs" );
+    while( (p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
+    {
+        vlc_object_detach( p_vout );
+        vlc_object_release( p_vout );
+        vout_Destroy( p_vout );
+    }
+
+    /* Free audio outputs */
+    msg_Dbg( p_libvlc, "removing all audio outputs" );
+    while( (p_aout = vlc_object_find( p_libvlc, VLC_OBJECT_AOUT, FIND_CHILD )) )
+    {
+        vlc_object_detach( (vlc_object_t *)p_aout );
+        vlc_object_release( (vlc_object_t *)p_aout );
+        aout_Delete( p_aout );
+    }
+
+    stats_TimersDumpAll( p_libvlc );
+    stats_TimersClean( p_libvlc );
+
+    /* Free announce handler(s?) */
+    while( (p_announce = vlc_object_find( p_libvlc, VLC_OBJECT_ANNOUNCE,
+                                                 FIND_CHILD ) ) )
+    {
+        msg_Dbg( p_libvlc, "removing announce handler" );
+        vlc_object_detach( p_announce );
+        vlc_object_release( p_announce );
+        announce_HandlerDestroy( p_announce );
+    }
+    return VLC_SUCCESS;
+}
+
+/**
+ * Destroy everything.
+ * This function requests the running threads to finish, waits for their
+ * termination, and destroys their structure.
+ * It stops the thread systems: no instance can run after this has run
+ * \param p_libvlc the instance to destroy
+ * \param b_release whether we should do a release on the instance
+ */
+int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release )
+{
+    /* Free allocated memory */
+    if( p_libvlc->p_memcpy_module )
+    {
+        module_Unneed( p_libvlc, p_libvlc->p_memcpy_module );
+        p_libvlc->p_memcpy_module = NULL;
+    }
+
+    /* Free module bank !  */
+    module_EndBank( p_libvlc );
+
+    FREENULL( p_libvlc->psz_homedir );
+    FREENULL( p_libvlc->psz_userdir );
+    FREENULL( p_libvlc->psz_configfile );
+    FREENULL( p_libvlc->p_hotkeys );
+
+    /* System specific cleaning code */
+    system_End( p_libvlc );
+
+    /*
+     * Free message queue.
+     * Nobody shall use msg_* afterward.
+     */
+    msg_Flush( p_libvlc );
+    msg_Destroy( p_libvlc_global );
+
+    /* Destroy global iconv */
+    LocaleDeinit();
+
+    /* Destroy mutexes */
+    vlc_mutex_destroy( &p_libvlc->config_lock );
+
+    vlc_object_detach( p_libvlc );
+    if( b_release ) vlc_object_release( p_libvlc );
+    vlc_object_destroy( p_libvlc );
+
+    /* Stop thread system: last one out please shut the door! */
+    vlc_threads_end( p_libvlc_global );
+
+    return VLC_SUCCESS;
+}
+
+/**
+ * Add an interface plugin and run it
+ */
+int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc,
+                            char const *psz_module,
+                            vlc_bool_t b_block, vlc_bool_t b_play,
+                            int i_options, char **ppsz_options )
+{
+    int i_err;
+    intf_thread_t *p_intf;
+
+#ifndef WIN32
+    if( p_libvlc->p_libvlc_global->b_daemon && b_block && !psz_module )
+    {
+        /* Daemon mode hack.
+         * We prefer the dummy interface if none is specified. */
+        char *psz_interface = config_GetPsz( p_libvlc, "intf" );
+        if( !psz_interface || !*psz_interface ) psz_module = "dummy";
+        if( psz_interface ) free( psz_interface );
+    }
+#endif
+
+    /* Try to create the interface */
+    p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf",
+                          i_options, ppsz_options );
+
+    if( p_intf == NULL )
+    {
+        msg_Err( p_libvlc, "interface \"%s\" initialization failed",
+                 psz_module );
+        return VLC_EGENERIC;
+    }
+
+    /* Interface doesn't handle play on start so do it ourselves */
+    if( !p_intf->b_play && b_play )
+        playlist_Play( p_libvlc->p_playlist );
+
+    /* Try to run the interface */
+    p_intf->b_play = b_play;
+    p_intf->b_block = b_block;
+    i_err = intf_RunThread( p_intf );
+    if( i_err )
+    {
+        vlc_object_detach( p_intf );
+        intf_Destroy( p_intf );
+        return i_err;
+    }
+    return VLC_SUCCESS;
+};
+
+
+/*****************************************************************************
+ * SetLanguage: set the interface language.
+ *****************************************************************************
+ * We set the LC_MESSAGES locale category for interface messages and buttons,
+ * as well as the LC_CTYPE category for string sorting and possible wide
+ * character support.
+ *****************************************************************************/
+static void SetLanguage ( char const *psz_lang )
+{
+#if defined( ENABLE_NLS ) \
+     && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
+
+    char *          psz_path;
+#if defined( __APPLE__ ) || defined ( WIN32 ) || defined( SYS_BEOS )
+    char            psz_tmp[1024];
+#endif
+
+    if( psz_lang && !*psz_lang )
+    {
+#   if defined( HAVE_LC_MESSAGES )
+        setlocale( LC_MESSAGES, psz_lang );
+#   endif
+        setlocale( LC_CTYPE, psz_lang );
+    }
+    else if( psz_lang )
+    {
+#ifdef __APPLE__
+        /* I need that under Darwin, please check it doesn't disturb
+         * other platforms. --Meuuh */
+        setenv( "LANG", psz_lang, 1 );
+
+#elif defined( SYS_BEOS ) || defined( WIN32 )
+        /* We set LC_ALL manually because it is the only way to set
+         * the language at runtime under eg. Windows. Beware that this
+         * makes the environment unconsistent when libvlc is unloaded and
+         * should probably be moved to a safer place like vlc.c. */
+        static char psz_lcall[20];
+        snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
+        psz_lcall[19] = '\0';
+        putenv( psz_lcall );
+#endif
+
+        setlocale( LC_ALL, psz_lang );
+    }
+
+    /* Specify where to find the locales for current domain */
+#if !defined( __APPLE__ ) && !defined( WIN32 ) && !defined( SYS_BEOS )
+    psz_path = LOCALEDIR;
+#else
+    snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc_global.psz_vlcpath,
+              "locale" );
+    psz_path = psz_tmp;
+#endif
+    if( !bindtextdomain( PACKAGE_NAME, psz_path ) )
+    {
+        fprintf( stderr, "warning: couldn't bind domain %s in directory %s\n",
+                 PACKAGE_NAME, psz_path );
+    }
+
+    /* Set the default domain */
+    bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
+#endif
+}
+
+/*****************************************************************************
+ * GetFilenames: parse command line options which are not flags
+ *****************************************************************************
+ * Parse command line for input files as well as their associated options.
+ * An option always follows its associated input and begins with a ":".
+ *****************************************************************************/
+static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, char *ppsz_argv[] )
+{
+    int i_opt, i_options;
+
+    /* We assume that the remaining parameters are filenames
+     * and their input options */
+    for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- )
+    {
+        const char *psz_target;
+        i_options = 0;
+
+        /* Count the input options */
+        while( *ppsz_argv[ i_opt ] == ':' && i_opt > optind )
+        {
+            i_options++;
+            i_opt--;
+        }
+
+        /* TODO: write an internal function of this one, to avoid
+         *       unnecessary lookups. */
+        /* FIXME: should we convert options to UTF-8 as well ?? */
+        psz_target = FromLocale( ppsz_argv[ i_opt ] );
+        VLC_AddTarget( p_vlc->i_object_id, psz_target,
+                       (char const **)( i_options ? &ppsz_argv[i_opt + 1] :
+                                        NULL ), i_options,
+                       PLAYLIST_INSERT, 0 );
+        LocaleFree( psz_target );
+    }
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Help: print program help
+ *****************************************************************************
+ * Print a short inline help. Message interface is initialized at this stage.
+ *****************************************************************************/
+static void Help( libvlc_int_t *p_this, char const *psz_help_name )
+{
+#ifdef WIN32
+    ShowConsole( VLC_TRUE );
+#endif
+
+    if( psz_help_name && !strcmp( psz_help_name, "help" ) )
+    {
+        utf8_fprintf( stdout, VLC_USAGE, p_this->psz_object_name );
+        Usage( p_this, "help" );
+        Usage( p_this, "main" );
+    }
+    else if( psz_help_name && !strcmp( psz_help_name, "longhelp" ) )
+    {
+        utf8_fprintf( stdout, VLC_USAGE, p_this->psz_object_name );
+        Usage( p_this, NULL );
+    }
+    else if( psz_help_name )
+    {
+        Usage( p_this, psz_help_name );
+    }
+
+#ifdef WIN32        /* Pause the console because it's destroyed when we exit */
+    PauseConsole();
+#endif
+}
+
+/*****************************************************************************
+ * Usage: print module usage
+ *****************************************************************************
+ * Print a short inline help. Message interface is initialized at this stage.
+ *****************************************************************************/
+static void Usage( libvlc_int_t *p_this, char const *psz_module_name )
+{
+#define FORMAT_STRING "  %s --%s%s%s%s%s%s%s "
+    /* short option ------'    |     | | | |  | |
+     * option name ------------'     | | | |  | |
+     * <bra -------------------------' | | |  | |
+     * option type or "" --------------' | |  | |
+     * ket> -----------------------------' |  | |
+     * padding spaces ---------------------'  | |
+     * comment -------------------------------' |
+     * comment suffix --------------------------'
+     *
+     * The purpose of having bra and ket is that we might i18n them as well.
+     */
+#define LINE_START 8
+#define PADDING_SPACES 25
+    vlc_list_t *p_list;
+    module_t *p_parser;
+    module_config_t *p_item;
+    char psz_spaces_text[PADDING_SPACES+LINE_START+1];
+    char psz_spaces_longtext[LINE_START+3];
+    char psz_format[sizeof(FORMAT_STRING)];
+    char psz_buffer[10000];
+    char psz_short[4];
+    int i_index;
+    int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1);
+    vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" );
+    vlc_bool_t b_description;
+
+    memset( psz_spaces_text, ' ', PADDING_SPACES+LINE_START );
+    psz_spaces_text[PADDING_SPACES+LINE_START] = '\0';
+    memset( psz_spaces_longtext, ' ', LINE_START+2 );
+    psz_spaces_longtext[LINE_START+2] = '\0';
+
+    strcpy( psz_format, FORMAT_STRING );
+
+    /* List all modules */
+    p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+
+    /* Enumerate the config for each module */
+    for( i_index = 0; i_index < p_list->i_count; i_index++ )
+    {
+        vlc_bool_t b_help_module;
+
+        p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+
+        if( psz_module_name && strcmp( psz_module_name,
+                                       p_parser->psz_object_name ) )
+        {
+            continue;
+        }
+
+        /* Ignore modules without config options */
+        if( !p_parser->i_config_items )
+        {
+            continue;
+        }
+
+        /* Ignore modules with only advanced config options if requested */
+        if( !b_advanced )
+        {
+            for( p_item = p_parser->p_config;
+                 p_item->i_type != CONFIG_HINT_END;
+                 p_item++ )
+            {
+                if( (p_item->i_type & CONFIG_ITEM) &&
+                    !p_item->b_advanced ) break;
+            }
+            if( p_item->i_type == CONFIG_HINT_END ) continue;
+        }
+
+        /* Print name of module */
+        if( strcmp( "main", p_parser->psz_object_name ) )
+        utf8_fprintf( stdout, "\n %s\n", p_parser->psz_longname );
+
+        b_help_module = !strcmp( "help", p_parser->psz_object_name );
+
+        /* Print module options */
+        for( p_item = p_parser->p_config;
+             p_item->i_type != CONFIG_HINT_END;
+             p_item++ )
+        {
+            char *psz_text, *psz_spaces = psz_spaces_text;
+            char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
+            char *psz_suf = "", *psz_prefix = NULL;
+            signed int i;
+
+            /* Skip deprecated options */
+            if( p_item->psz_current )
+            {
+                continue;
+            }
+            /* Skip advanced options if requested */
+            if( p_item->b_advanced && !b_advanced )
+            {
+                continue;
+            }
+
+            switch( p_item->i_type )
+            {
+            case CONFIG_HINT_CATEGORY:
+            case CONFIG_HINT_USAGE:
+                if( !strcmp( "main", p_parser->psz_object_name ) )
+                utf8_fprintf( stdout, "\n %s\n", p_item->psz_text );
+                break;
+
+            case CONFIG_ITEM_STRING:
+            case CONFIG_ITEM_FILE:
+            case CONFIG_ITEM_DIRECTORY:
+            case CONFIG_ITEM_MODULE: /* We could also have "=<" here */
+            case CONFIG_ITEM_MODULE_CAT:
+            case CONFIG_ITEM_MODULE_LIST:
+            case CONFIG_ITEM_MODULE_LIST_CAT:
+                psz_bra = " <"; psz_type = _("string"); psz_ket = ">";
+
+                if( p_item->ppsz_list )
+                {
+                    psz_bra = " {";
+                    psz_type = psz_buffer;
+                    psz_type[0] = '\0';
+                    for( i = 0; p_item->ppsz_list[i]; i++ )
+                    {
+                        if( i ) strcat( psz_type, "," );
+                        strcat( psz_type, p_item->ppsz_list[i] );
+                    }
+                    psz_ket = "}";
+                }
+                break;
+            case CONFIG_ITEM_INTEGER:
+            case CONFIG_ITEM_KEY: /* FIXME: do something a bit more clever */
+                psz_bra = " <"; psz_type = _("integer"); psz_ket = ">";
+
+                if( p_item->i_list )
+                {
+                    psz_bra = " {";
+                    psz_type = psz_buffer;
+                    psz_type[0] = '\0';
+                    for( i = 0; p_item->ppsz_list_text[i]; i++ )
+                    {
+                        if( i ) strcat( psz_type, ", " );
+                        sprintf( psz_type + strlen(psz_type), "%i (%s)",
+                                 p_item->pi_list[i],
+                                 p_item->ppsz_list_text[i] );
+                    }
+                    psz_ket = "}";
+                }
+                break;
+            case CONFIG_ITEM_FLOAT:
+                psz_bra = " <"; psz_type = _("float"); psz_ket = ">";
+                break;
+            case CONFIG_ITEM_BOOL:
+                psz_bra = ""; psz_type = ""; psz_ket = "";
+                if( !b_help_module )
+                {
+                    psz_suf = p_item->i_value ? _(" (default enabled)") :
+                                                _(" (default disabled)");
+                }
+                break;
+            }
+
+            if( !psz_type )
+            {
+                continue;
+            }
+
+            /* Add short option if any */
+            if( p_item->i_short )
+            {
+                sprintf( psz_short, "-%c,", p_item->i_short );
+            }
+            else
+            {
+                strcpy( psz_short, "   " );
+            }
+
+            i = PADDING_SPACES - strlen( p_item->psz_name )
+                 - strlen( psz_bra ) - strlen( psz_type )
+                 - strlen( psz_ket ) - 1;
+
+            if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module )
+            {
+                psz_prefix =  ", --no-";
+                i -= strlen( p_item->psz_name ) + strlen( psz_prefix );
+            }
+
+            if( i < 0 )
+            {
+                psz_spaces[0] = '\n';
+                i = 0;
+            }
+            else
+            {
+                psz_spaces[i] = '\0';
+            }
+
+            if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module )
+            {
+                utf8_fprintf( stdout, psz_format, psz_short, p_item->psz_name,
+                         psz_prefix, p_item->psz_name, psz_bra, psz_type,
+                         psz_ket, psz_spaces );
+            }
+            else
+            {
+                utf8_fprintf( stdout, psz_format, psz_short, p_item->psz_name,
+                         "", "", psz_bra, psz_type, psz_ket, psz_spaces );
+            }
+
+            psz_spaces[i] = ' ';
+
+            /* We wrap the rest of the output */
+            sprintf( psz_buffer, "%s%s", p_item->psz_text, psz_suf );
+            b_description = config_GetInt( p_this, "help-verbose" );
+
+ description:
+            psz_text = psz_buffer;
+            while( *psz_text )
+            {
+                char *psz_parser, *psz_word;
+                size_t i_end = strlen( psz_text );
+
+                /* If the remaining text fits in a line, print it. */
+                if( i_end <= (size_t)i_width )
+                {
+                    utf8_fprintf( stdout, "%s\n", psz_text );
+                    break;
+                }
+
+                /* Otherwise, eat as many words as possible */
+                psz_parser = psz_text;
+                do
+                {
+                    psz_word = psz_parser;
+                    psz_parser = strchr( psz_word, ' ' );
+                    /* If no space was found, we reached the end of the text
+                     * block; otherwise, we skip the space we just found. */
+                    psz_parser = psz_parser ? psz_parser + 1
+                                            : psz_text + i_end;
+
+                } while( psz_parser - psz_text <= i_width );
+
+                /* We cut a word in one of these cases:
+                 *  - it's the only word in the line and it's too long.
+                 *  - we used less than 80% of the width and the word we are
+                 *    going to wrap is longer than 40% of the width, and even
+                 *    if the word would have fit in the next line. */
+                if( psz_word == psz_text
+                     || ( psz_word - psz_text < 80 * i_width / 100
+                           && psz_parser - psz_word > 40 * i_width / 100 ) )
+                {
+                    char c = psz_text[i_width];
+                    psz_text[i_width] = '\0';
+                    utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces );
+                    psz_text += i_width;
+                    psz_text[0] = c;
+                }
+                else
+                {
+                    psz_word[-1] = '\0';
+                    utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces );
+                    psz_text = psz_word;
+                }
+            }
+
+            if( b_description && p_item->psz_longtext )
+            {
+                sprintf( psz_buffer, "%s%s", p_item->psz_longtext, psz_suf );
+                b_description = VLC_FALSE;
+                psz_spaces = psz_spaces_longtext;
+                utf8_fprintf( stdout, "%s", psz_spaces );
+                goto description;
+            }
+        }
+    }
+
+    /* Release the module list */
+    vlc_list_release( p_list );
+}
+
+/*****************************************************************************
+ * ListModules: list the available modules with their description
+ *****************************************************************************
+ * Print a list of all available modules (builtins and plugins) and a short
+ * description for each one.
+ *****************************************************************************/
+static void ListModules( libvlc_int_t *p_this )
+{
+    vlc_list_t *p_list;
+    module_t *p_parser;
+    char psz_spaces[22];
+    int i_index;
+
+    memset( psz_spaces, ' ', 22 );
+
+#ifdef WIN32
+    ShowConsole( VLC_TRUE );
+#endif
+
+    /* List all modules */
+    p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+
+    /* Enumerate each module */
+    for( i_index = 0; i_index < p_list->i_count; i_index++ )
+    {
+        int i;
+
+        p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+
+        /* Nasty hack, but right now I'm too tired to think about a nice
+         * solution */
+        i = 22 - strlen( p_parser->psz_object_name ) - 1;
+        if( i < 0 ) i = 0;
+        psz_spaces[i] = 0;
+
+        utf8_fprintf( stdout, "  %s%s %s\n", p_parser->psz_object_name,
+                         psz_spaces, p_parser->psz_longname );
+
+        psz_spaces[i] = ' ';
+    }
+
+    vlc_list_release( p_list );
+
+#ifdef WIN32        /* Pause the console because it's destroyed when we exit */
+    PauseConsole();
+#endif
+}
+
+/*****************************************************************************
+ * Version: print complete program version
+ *****************************************************************************
+ * Print complete program version and build number.
+ *****************************************************************************/
+static void Version( void )
+{
+#ifdef WIN32
+    ShowConsole( VLC_TRUE );
+#endif
+
+    utf8_fprintf( stdout, _("VLC version %s\n"), VLC_Version() );
+    utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"),
+             VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
+    utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
+#ifndef HAVE_SHARED_LIBVLC
+    if( strcmp( VLC_Changeset(), "exported" ) )
+        utf8_fprintf( stdout, _("Based upon svn changeset [%s]\n"),
+                 VLC_Changeset() );
+#endif
+    utf8_fprintf( stdout, LICENSE_MSG );
+
+#ifdef WIN32        /* Pause the console because it's destroyed when we exit */
+    PauseConsole();
+#endif
+}
+
+/*****************************************************************************
+ * ShowConsole: On Win32, create an output console for debug messages
+ *****************************************************************************
+ * This function is useful only on Win32.
+ *****************************************************************************/
+#ifdef WIN32 /*  */
+static void ShowConsole( vlc_bool_t b_dofile )
+{
+#   ifndef UNDER_CE
+    FILE *f_help;
+
+    if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
+
+    AllocConsole();
+
+    freopen( "CONOUT$", "w", stderr );
+    freopen( "CONIN$", "r", stdin );
+
+    if( b_dofile && (f_help = fopen( "vlc-help.txt", "wt" )) )
+    {
+        fclose( f_help );
+        freopen( "vlc-help.txt", "wt", stdout );
+        utf8_fprintf( stderr, _("\nDumped content to vlc-help.txt file.\n") );
+    }
+
+    else freopen( "CONOUT$", "w", stdout );
+
+#   endif
+}
+#endif
+
+/*****************************************************************************
+ * PauseConsole: On Win32, wait for a key press before closing the console
+ *****************************************************************************
+ * This function is useful only on Win32.
+ *****************************************************************************/
+#ifdef WIN32 /*  */
+static void PauseConsole( void )
+{
+#   ifndef UNDER_CE
+
+    if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
+
+    utf8_fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
+    getchar();
+    fclose( stdout );
+
+#   endif
+}
+#endif
+
+/*****************************************************************************
+ * ConsoleWidth: Return the console width in characters
+ *****************************************************************************
+ * We use the stty shell command to get the console width; if this fails or
+ * if the width is less than 80, we default to 80.
+ *****************************************************************************/
+static int ConsoleWidth( void )
+{
+    int i_width = 80;
+
+#ifndef WIN32
+    char buf[20], *psz_parser;
+    FILE *file;
+    int i_ret;
+
+    file = popen( "stty size 2>/dev/null", "r" );
+    if( file )
+    {
+        i_ret = fread( buf, 1, 20, file );
+        if( i_ret > 0 )
+        {
+            buf[19] = '\0';
+            psz_parser = strchr( buf, ' ' );
+            if( psz_parser )
+            {
+                i_ret = atoi( psz_parser + 1 );
+                if( i_ret >= 80 )
+                {
+                    i_width = i_ret;
+                }
+            }
+        }
+
+        pclose( file );
+    }
+#endif
+
+    return i_width;
+}
+
+static int VerboseCallback( vlc_object_t *p_this, const char *psz_variable,
+                     vlc_value_t old_val, vlc_value_t new_val, void *param)
+{
+    libvlc_int_t *p_vlc = (libvlc_int_t *)p_this;
+
+    if( new_val.i_int >= -1 )
+    {
+        p_vlc->p_libvlc_global->i_verbose = __MIN( new_val.i_int, 2 );
+    }
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * InitDeviceValues: initialize device values
+ *****************************************************************************
+ * This function inits the dvd, vcd and cd-audio values
+ *****************************************************************************/
+static void InitDeviceValues( libvlc_int_t *p_vlc )
+{
+#ifdef HAVE_HAL
+    LibHalContext * ctx;
+    int i, i_devices;
+    char **devices;
+    char *block_dev;
+    dbus_bool_t b_dvd;
+    DBusConnection *p_connection;
+    DBusError       error;
+
+#ifdef HAVE_HAL_1
+    ctx =  libhal_ctx_new();
+    if( !ctx ) return;
+    dbus_error_init( &error );
+    p_connection = dbus_bus_get ( DBUS_BUS_SYSTEM, &error );
+    if( dbus_error_is_set( &error ) )
+    {
+        dbus_error_free( &error );
+        return;
+    }
+    libhal_ctx_set_dbus_connection( ctx, p_connection );
+    if( libhal_ctx_init( ctx, &error ) )
+#else
+    if( ( ctx = hal_initialize( NULL, FALSE ) ) )
+#endif
+    {
+#ifdef HAVE_HAL_1
+        if( ( devices = libhal_get_all_devices( ctx, &i_devices, NULL ) ) )
+#else
+        if( ( devices = hal_get_all_devices( ctx, &i_devices ) ) )
+#endif
+        {
+            for( i = 0; i < i_devices; i++ )
+            {
+#ifdef HAVE_HAL_1
+                if( !libhal_device_property_exists( ctx, devices[i],
+                                                "storage.cdrom.dvd", NULL ) )
+#else
+                if( !hal_device_property_exists( ctx, devices[ i ],
+                                                "storage.cdrom.dvd" ) )
+#endif
+                {
+                    continue;
+                }
+#ifdef HAVE_HAL_1
+                b_dvd = libhal_device_get_property_bool( ctx, devices[ i ],
+                                                 "storage.cdrom.dvd", NULL  );
+                block_dev = libhal_device_get_property_string( ctx,
+                                devices[ i ], "block.device" , NULL );
+#else
+                b_dvd = hal_device_get_property_bool( ctx, devices[ i ],
+                                                      "storage.cdrom.dvd" );
+                block_dev = hal_device_get_property_string( ctx, devices[ i ],
+                                                            "block.device" );
+#endif
+                if( b_dvd )
+                {
+                    config_PutPsz( p_vlc, "dvd", block_dev );
+                }
+
+                config_PutPsz( p_vlc, "vcd", block_dev );
+                config_PutPsz( p_vlc, "cd-audio", block_dev );
+#ifdef HAVE_HAL_1
+                libhal_free_string( block_dev );
+#else
+                hal_free_string( block_dev );
+#endif
+            }
+#ifdef HAVE_HAL_1
+            libhal_free_string_array( devices );
+#else
+            hal_free_string_array( devices );
+#endif
+        }
+
+#ifdef HAVE_HAL_1
+        libhal_ctx_shutdown( ctx, NULL );
+#else
+        hal_shutdown( ctx );
+#endif
+    }
+    else
+    {
+        msg_Warn( p_vlc, "Unable to get HAL device properties" );
+    }
+#endif
+}

src/libvlc.c

@@ -38,101 +38,14 @@
 #include <vlc/vlc.h>
 #include <vlc/input.h>
 
-#include <errno.h>                                                 /* ENOMEM */
-#include <stdio.h>                                              /* sprintf() */
-#include <string.h>                                            /* strerror() */
-#include <stdlib.h>                                                /* free() */
+#include <libvlc_internal.h>
 
-#ifndef WIN32
-#   include <netinet/in.h>                            /* BSD: struct in_addr */
-#endif
-
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#elif defined( WIN32 ) && !defined( UNDER_CE )
-#   include <io.h>
-#endif
-
-#ifdef WIN32                       /* optind, getopt(), included in unistd.h */
-#   include "extras/getopt.h"
-#endif
-
-#ifdef HAVE_LOCALE_H
-#   include <locale.h>
-#endif
-
-#ifdef HAVE_HAL
-#   include <hal/libhal.h>
-#endif
-
-#include "vlc_cpu.h"                                        /* CPU detection */
-#include "os_specific.h"
-
-#include "vlc_error.h"
-
-#include "vlc_playlist.h"
-#include "vlc_interface.h"
+#include <vlc_error.h>
 
 #include "audio_output.h"
-
 #include "vlc_video.h"
 #include "video_output.h"
 
-#include "stream_output.h"
-#include "charset.h"
-
-#include "libvlc.h"
-
-/*****************************************************************************
- * The evil global variable. We handle it with care, don't worry.
- *****************************************************************************/
-static libvlc_global_data_t   libvlc_global;
-static libvlc_global_data_t * p_libvlc_global;
-static libvlc_int_t *    p_static_vlc;
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int AddIntfInternal( int i_object, char const *psz_module,
-                             vlc_bool_t b_block, vlc_bool_t b_play,
-                             int i_options, char **ppsz_options );
-
-void LocaleInit( vlc_object_t * );
-void LocaleDeinit( void );
-static void SetLanguage   ( char const * );
-static int  GetFilenames  ( libvlc_int_t *, int, char *[] );
-static void Help          ( libvlc_int_t *, char const *psz_help_name );
-static void Usage         ( libvlc_int_t *, char const *psz_module_name );
-static void ListModules   ( libvlc_int_t * );
-static void Version       ( void );
-
-#ifdef WIN32
-static void ShowConsole   ( vlc_bool_t );
-static void PauseConsole  ( void );
-#endif
-static int  ConsoleWidth  ( void );
-
-static int  VerboseCallback( vlc_object_t *, char const *,
-                             vlc_value_t, vlc_value_t, void * );
-
-static void InitDeviceValues( libvlc_int_t * );
-
-/*****************************************************************************
- * vlc_current_object: return the current object.
- *****************************************************************************
- * If i_object is non-zero, return the corresponding object. Otherwise,
- * return the statically allocated p_vlc object.
- *****************************************************************************/
-libvlc_int_t * vlc_current_object( int i_object )
-{
-    if( i_object )
-    {
-         return vlc_object_get( p_libvlc_global, i_object );
-    }
-
-    return p_static_vlc;
-}
-
 /*****************************************************************************
  * VLC_Version: return the libvlc version.
  *****************************************************************************
@@ -184,83 +97,9 @@ char const * VLC_Error( int i_err )
  *****************************************************************************/
 int VLC_Create( void )
 {
-    int i_ret;
-    libvlc_int_t * p_libvlc = NULL;
-    vlc_value_t lockval;
-
-    /* &libvlc never changes, so we can safely call this multiple times. */
-    p_libvlc_global = &libvlc_global;
-
-    /* vlc_threads_init *must* be the first internal call! No other call is
-     * allowed before the thread system has been initialized. */
-    i_ret = vlc_threads_init( p_libvlc_global );
-    if( i_ret < 0 )
-    {
-        return i_ret;
-    }
-
-    /* Now that the thread system is initialized, we don't have much, but
-     * at least we have var_Create */
-    var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
-    var_Get( p_libvlc_global, "libvlc", &lockval );
-    vlc_mutex_lock( lockval.p_address );
-    if( !libvlc_global.b_ready )
-    {
-        char *psz_env;
-
-        /* Guess what CPU we have */
-        libvlc_global.i_cpu = CPUCapabilities();
-
-        /* Find verbosity from VLC_VERBOSE environment variable */
-        psz_env = getenv( "VLC_VERBOSE" );
-        libvlc_global.i_verbose = psz_env ? atoi( psz_env ) : -1;
-
-#if defined( HAVE_ISATTY ) && !defined( WIN32 )
-        libvlc_global.b_color = isatty( 2 ); /* 2 is for stderr */
-#else
-        libvlc_global.b_color = VLC_FALSE;
-#endif
-
-        /* Initialize message queue */
-        msg_Create( p_libvlc_global );
-
-        /* Announce who we are */
-        msg_Dbg( p_libvlc_global, COPYRIGHT_MESSAGE );
-        msg_Dbg( p_libvlc_global, "libvlc was configured with %s",
-                                CONFIGURE_LINE );
-
-        /* The module bank will be initialized later */
-        libvlc_global.p_module_bank = NULL;
-
-        libvlc_global.b_ready = VLC_TRUE;
-    }
-    vlc_mutex_unlock( lockval.p_address );
-    var_Destroy( p_libvlc_global, "libvlc" );
-
-    /* Allocate a vlc object */
-    p_libvlc = vlc_object_create( p_libvlc_global, VLC_OBJECT_LIBVLC );
-    if( p_libvlc == NULL )
-    {
-        return VLC_EGENERIC;
-    }
-    p_libvlc->thread_id = 0;
-    p_libvlc->p_playlist = NULL;
-    p_libvlc->psz_object_name = "libvlc";
-
-    /* Initialize mutexes */
-    vlc_mutex_init( p_libvlc, &p_libvlc->config_lock );
-#ifdef __APPLE__
-    vlc_mutex_init( p_libvlc, &p_libvlc->quicktime_lock );
-    vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW );
-#endif
-
-    /* Store our newly allocated structure in the global list */
-    vlc_object_attach( p_libvlc, p_libvlc_global );
-
-    /* Store data for the non-reentrant API */
-    p_static_vlc = p_libvlc;
-
-    return p_libvlc->i_object_id;
+    libvlc_int_t *p_object = libvlc_InternalCreate();
+    if( p_object ) return p_object->i_object_id;
+    return VLC_ENOOBJ;
 }
 
 #define LIBVLC_FUNC \
@@ -281,590 +120,11 @@ int VLC_Create( void )
  *****************************************************************************/
 int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
 {
-    char         p_capabilities[200];
-    char *       p_tmp;
-    char *       psz_modules;
-    char *       psz_parser;
-    char *       psz_control;
-    vlc_bool_t   b_exit = VLC_FALSE;
-    int          i_ret = VLC_EEXIT;
-    module_t    *p_help_module;
-    playlist_t  *p_playlist;
-    vlc_value_t  val;
-#if defined( ENABLE_NLS ) \
-     && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
-# if defined (WIN32) || defined (__APPLE__)
-    char *       psz_language;
-#endif
-#endif
+    int i_ret;
     LIBVLC_FUNC;
-
-    /* System specific initialization code */
-    system_Init( p_libvlc, &i_argc, ppsz_argv );
-
-    /* Get the executable name (similar to the basename command) */
-    if( i_argc > 0 )
-    {
-        p_libvlc->psz_object_name = p_tmp = ppsz_argv[ 0 ];
-        while( *p_tmp )
-        {
-            if( *p_tmp == '/' ) p_libvlc->psz_object_name = ++p_tmp;
-            else ++p_tmp;
-        }
-    }
-    else
-    {
-        p_libvlc->psz_object_name = "vlc";
-    }
-
-    /*
-     * Support for gettext
-     */
-    SetLanguage( "" );
-
-    /*
-     * Global iconv, must be done after setlocale()
-     * so that vlc_current_charset() works.
-     */
-    LocaleInit( (vlc_object_t *)p_libvlc );
-
-    /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
-    msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
-
-    /* Initialize the module bank and load the configuration of the
-     * main module. We need to do this at this stage to be able to display
-     * a short help if required by the user. (short help == main module
-     * options) */
-    module_InitBank( p_libvlc );
-
-    /* Hack: insert the help module here */
-    p_help_module = vlc_object_create( p_libvlc, VLC_OBJECT_MODULE );
-    if( p_help_module == NULL )
-    {
-        module_EndBank( p_libvlc );
-        if( i_object ) vlc_object_release( p_libvlc );
-        return VLC_EGENERIC;
-    }
-    p_help_module->psz_object_name = "help";
-    p_help_module->psz_longname = N_("Help options");
-    config_Duplicate( p_help_module, p_help_config );
-    vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
-    /* End hack */
-
-    if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ) )
-    {
-        vlc_object_detach( p_help_module );
-        config_Free( p_help_module );
-        vlc_object_destroy( p_help_module );
-        module_EndBank( p_libvlc );
-        if( i_object ) vlc_object_release( p_libvlc );
-        return VLC_EGENERIC;
-    }
-
-    /* Check for short help option */
-    if( config_GetInt( p_libvlc, "help" ) )
-    {
-        Help( p_libvlc, "help" );
-        b_exit = VLC_TRUE;
-        i_ret = VLC_EEXITSUCCESS;
-    }
-    /* Check for version option */
-    else if( config_GetInt( p_libvlc, "version" ) )
-    {
-        Version();
-        b_exit = VLC_TRUE;
-        i_ret = VLC_EEXITSUCCESS;
-    }
-
-    /* Set the config file stuff */
-    p_libvlc->psz_homedir = config_GetHomeDir();
-    p_libvlc->psz_userdir = config_GetUserDir();
-    if( p_libvlc->psz_userdir == NULL )
-        p_libvlc->psz_userdir = strdup(p_libvlc->psz_homedir);
-    p_libvlc->psz_configfile = config_GetPsz( p_libvlc, "config" );
-    if( p_libvlc->psz_configfile != NULL && p_libvlc->psz_configfile[0] == '~'
-         && p_libvlc->psz_configfile[1] == '/' )
-    {
-        char *psz = malloc( strlen(p_libvlc->psz_userdir)
-                             + strlen(p_libvlc->psz_configfile) );
-        /* This is incomplete : we should also support the ~cmassiot/ syntax. */
-        sprintf( psz, "%s/%s", p_libvlc->psz_userdir,
-                               p_libvlc->psz_configfile + 2 );
-        free( p_libvlc->psz_configfile );
-        p_libvlc->psz_configfile = psz;
-    }
-
-    /* Check for plugins cache options */
-    if( config_GetInt( p_libvlc, "reset-plugins-cache" ) )
-    {
-        libvlc_global.p_module_bank->b_cache_delete = VLC_TRUE;
-    }
-
-    /* Hack: remove the help module here */
-    vlc_object_detach( p_help_module );
-    /* End hack */
-
-    /* Will be re-done properly later on */
-    p_libvlc->p_libvlc_global->i_verbose = config_GetInt( p_libvlc, "verbose" );
-
-    /* Check for daemon mode */
-#ifndef WIN32
-    if( config_GetInt( p_libvlc, "daemon" ) )
-    {
-#if HAVE_DAEMON
-        if( daemon( 1, 0) != 0 )
-        {
-            msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" );
-            b_exit = VLC_TRUE;
-        }
-
-        p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE;
-
-        /* lets check if we need to write the pidfile */
-        char * psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
-        
-        msg_Dbg( p_libvlc, "psz_pidfile is %s", psz_pidfile );
-        
-        if( psz_pidfile != NULL )
-        {
-            FILE *pidfile;
-            pid_t i_pid = getpid ();
-            
-            msg_Dbg( p_libvlc, "our PID is %d, writing it to %s", i_pid, psz_pidfile );
-            
-            pidfile = utf8_fopen( psz_pidfile,"w" );
-            if( pidfile != NULL )
-            {
-                utf8_fprintf( pidfile, "%d", (int)i_pid );
-                fclose( pidfile );
-            }
-            else
-            {
-                msg_Err( p_libvlc, "Cannot open pid file for writing: %s, error: %s", 
-                        psz_pidfile, strerror(errno) );
-            }
-        }
-
-        free( psz_pidfile );
-
-#else
-        pid_t i_pid;
-
-        if( ( i_pid = fork() ) < 0 )
-        {
-            msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" );
-            b_exit = VLC_TRUE;
-        }
-        else if( i_pid )
-        {
-            /* This is the parent, exit right now */
-            msg_Dbg( p_libvlc, "closing parent process" );
-            b_exit = VLC_TRUE;
-            i_ret = VLC_EEXITSUCCESS;
-        }
-        else
-        {
-            /* We are the child */
-            msg_Dbg( p_libvlc, "daemon spawned" );
-            close( STDIN_FILENO );
-            close( STDOUT_FILENO );
-            close( STDERR_FILENO );
-
-            p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE;
-        }
-#endif
-    }
-#endif
-
-    if( b_exit )
-    {
-        config_Free( p_help_module );
-        vlc_object_destroy( p_help_module );
-        module_EndBank( p_libvlc );
-        if( i_object ) vlc_object_release( p_libvlc );
-        return i_ret;
-    }
-
-    /* Check for translation config option */
-#if defined( ENABLE_NLS ) \
-     && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
-# if defined (WIN32) || defined (__APPLE__)
-    /* This ain't really nice to have to reload the config here but it seems
-     * the only way to do it. */
-    config_LoadConfigFile( p_libvlc, "main" );
-    config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
-
-    /* Check if the user specified a custom language */
-    psz_language = config_GetPsz( p_libvlc, "language" );
-    if( psz_language && *psz_language && strcmp( psz_language, "auto" ) )
-    {
-        vlc_bool_t b_cache_delete = libvlc_global.p_module_bank->b_cache_delete;
-
-        /* Reset the default domain */
-        SetLanguage( psz_language );
-
-        /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
-        msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
-
-        module_EndBank( p_libvlc );
-        module_InitBank( p_libvlc );
-        config_LoadConfigFile( p_libvlc, "main" );
-        config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
-        libvlc_global.p_module_bank->b_cache_delete = b_cache_delete;
-    }
-    if( psz_language ) free( psz_language );
-# endif
-#endif
-
-    /*
-     * Load the builtins and plugins into the module_bank.
-     * We have to do it before config_Load*() because this also gets the
-     * list of configuration options exported by each module and loads their
-     * default values.
-     */
-    module_LoadBuiltins( p_libvlc );
-    module_LoadPlugins( p_libvlc );
-    if( p_libvlc->b_die )
-    {
-        b_exit = VLC_TRUE;
-    }
-
-    msg_Dbg( p_libvlc, "module bank initialized, found %i modules",
-                    libvlc_global.p_module_bank->i_children );
-
-    /* Hack: insert the help module here */
-    vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
-    /* End hack */
-
-    /* Check for help on modules */
-    if( (p_tmp = config_GetPsz( p_libvlc, "module" )) )
-    {
-        Help( p_libvlc, p_tmp );
-        free( p_tmp );
-        b_exit = VLC_TRUE;
-        i_ret = VLC_EEXITSUCCESS;
-    }
-    /* Check for long help option */
-    else if( config_GetInt( p_libvlc, "longhelp" ) )
-    {
-        Help( p_libvlc, "longhelp" );
-        b_exit = VLC_TRUE;
-        i_ret = VLC_EEXITSUCCESS;
-    }
-    /* Check for module list option */
-    else if( config_GetInt( p_libvlc, "list" ) )
-    {
-        ListModules( p_libvlc );
-        b_exit = VLC_TRUE;
-        i_ret = VLC_EEXITSUCCESS;
-    }
-
-    /* Check for config file options */
-    if( config_GetInt( p_libvlc, "reset-config" ) )
-    {
-        vlc_object_detach( p_help_module );
-        config_ResetAll( p_libvlc );
-        config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
-        config_SaveConfigFile( p_libvlc, NULL );
-        vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
-    }
-    if( config_GetInt( p_libvlc, "save-config" ) )
-    {
-        vlc_object_detach( p_help_module );
-        config_LoadConfigFile( p_libvlc, NULL );
-        config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
-        config_SaveConfigFile( p_libvlc, NULL );
-        vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
-    }
-
-    /* Hack: remove the help module here */
-    vlc_object_detach( p_help_module );
-    /* End hack */
-
-    if( b_exit )
-    {
-        config_Free( p_help_module );
-        vlc_object_destroy( p_help_module );
-        module_EndBank( p_libvlc );
-        if( i_object ) vlc_object_release( p_libvlc );
-        return i_ret;
-    }
-
-    /*
-     * Init device values
-     */
-    InitDeviceValues( p_libvlc );
-
-    /*
-     * Override default configuration with config file settings
-     */
-    config_LoadConfigFile( p_libvlc, NULL );
-
-    /* Hack: insert the help module here */
-    vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
-    /* End hack */
-
-    /*
-     * Override configuration with command line settings
-     */
-    if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_FALSE ) )
-    {
-#ifdef WIN32
-        ShowConsole( VLC_FALSE );
-        /* Pause the console because it's destroyed when we exit */
-        fprintf( stderr, "The command line options couldn't be loaded, check "
-                 "that they are valid.\n" );
-        PauseConsole();
-#endif
-        vlc_object_detach( p_help_module );
-        config_Free( p_help_module );
-        vlc_object_destroy( p_help_module );
-        module_EndBank( p_libvlc );
-        if( i_object ) vlc_object_release( p_libvlc );
-        return VLC_EGENERIC;
-    }
-
-    /* Hack: remove the help module here */
-    vlc_object_detach( p_help_module );
-    config_Free( p_help_module );
-    vlc_object_destroy( p_help_module );
-    /* End hack */
-
-    /*
-     * System specific configuration
-     */
-    system_Configure( p_libvlc, &i_argc, ppsz_argv );
-
-    /*
-     * Message queue options
-     */
-
-    var_Create( p_libvlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-    if( config_GetInt( p_libvlc, "quiet" ) )
-    {
-        val.i_int = -1;
-        var_Set( p_libvlc, "verbose", val );
-    }
-    var_AddCallback( p_libvlc, "verbose", VerboseCallback, NULL );
-    var_Change( p_libvlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL );
-
-    libvlc_global.b_color = libvlc_global.b_color && 
-                                config_GetInt( p_libvlc, "color" );
-
-    /*
-     * Output messages that may still be in the queue
-     */
-    msg_Flush( p_libvlc );
-
-    /* p_libvlc initialization. FIXME ? */
-
-    if( !config_GetInt( p_libvlc, "fpu" ) )
-        libvlc_global.i_cpu &= ~CPU_CAPABILITY_FPU;
-
-#if defined( __i386__ ) || defined( __x86_64__ )
-    if( !config_GetInt( p_libvlc, "mmx" ) )
-        libvlc_global.i_cpu &= ~CPU_CAPABILITY_MMX;
-    if( !config_GetInt( p_libvlc, "3dn" ) )
-        libvlc_global.i_cpu &= ~CPU_CAPABILITY_3DNOW;
-    if( !config_GetInt( p_libvlc, "mmxext" ) )
-        libvlc_global.i_cpu &= ~CPU_CAPABILITY_MMXEXT;
-    if( !config_GetInt( p_libvlc, "sse" ) )
-        libvlc_global.i_cpu &= ~CPU_CAPABILITY_SSE;
-    if( !config_GetInt( p_libvlc, "sse2" ) )
-        libvlc_global.i_cpu &= ~CPU_CAPABILITY_SSE2;
-#endif
-#if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
-    if( !config_GetInt( p_libvlc, "altivec" ) )
-        libvlc_global.i_cpu &= ~CPU_CAPABILITY_ALTIVEC;
-#endif
-
-#define PRINT_CAPABILITY( capability, string )                              \
-    if( libvlc_global.i_cpu & capability )                                         \
-    {                                                                       \
-        strncat( p_capabilities, string " ",                                \
-                 sizeof(p_capabilities) - strlen(p_capabilities) );         \
-        p_capabilities[sizeof(p_capabilities) - 1] = '\0';                  \
-    }
-
-    p_capabilities[0] = '\0';
-    PRINT_CAPABILITY( CPU_CAPABILITY_486, "486" );
-    PRINT_CAPABILITY( CPU_CAPABILITY_586, "586" );
-    PRINT_CAPABILITY( CPU_CAPABILITY_PPRO, "Pentium Pro" );
-    PRINT_CAPABILITY( CPU_CAPABILITY_MMX, "MMX" );
-    PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" );
-    PRINT_CAPABILITY( CPU_CAPABILITY_MMXEXT, "MMXEXT" );
-    PRINT_CAPABILITY( CPU_CAPABILITY_SSE, "SSE" );
-    PRINT_CAPABILITY( CPU_CAPABILITY_SSE2, "SSE2" );
-    PRINT_CAPABILITY( CPU_CAPABILITY_ALTIVEC, "AltiVec" );
-    PRINT_CAPABILITY( CPU_CAPABILITY_FPU, "FPU" );
-    msg_Dbg( p_libvlc, "CPU has capabilities %s", p_capabilities );
-
-    /*
-     * Choose the best memcpy module
-     */
-    p_libvlc->p_memcpy_module = module_Need( p_libvlc, "memcpy", "$memcpy", 0 );
-
-    if( p_libvlc->pf_memcpy == NULL )
-    {
-        p_libvlc->pf_memcpy = memcpy;
-    }
-
-    if( p_libvlc->pf_memset == NULL )
-    {
-        p_libvlc->pf_memset = memset;
-    }
-
-    p_libvlc->b_stats = config_GetInt( p_libvlc, "stats" );
-    p_libvlc->i_timers = 0;
-    p_libvlc->pp_timers = NULL;
-    vlc_mutex_init( p_libvlc, &p_libvlc->timer_lock );
-
-    /*
-     * Initialize hotkey handling
-     */
-    var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER );
-    p_libvlc->p_hotkeys = malloc( sizeof(p_hotkeys) );
-    /* Do a copy (we don't need to modify the strings) */
-    memcpy( p_libvlc->p_hotkeys, p_hotkeys, sizeof(p_hotkeys) );
-
-    /* Initialize playlist and get commandline files */
-    playlist_ThreadCreate( p_libvlc );
-    if( !p_libvlc->p_playlist )
-    {
-        msg_Err( p_libvlc, "playlist initialization failed" );
-        if( p_libvlc->p_memcpy_module != NULL )
-        {
-            module_Unneed( p_libvlc, p_libvlc->p_memcpy_module );
-        }
-        module_EndBank( p_libvlc );
-        if( i_object ) vlc_object_release( p_libvlc );
-        return VLC_EGENERIC;
-    }
-    p_playlist = p_libvlc->p_playlist;
-
-    psz_modules = config_GetPsz( p_playlist, "services-discovery" );
-    if( psz_modules && *psz_modules )
-    {
-        /* Add service discovery modules */
-        playlist_AddSDModules( p_playlist, psz_modules );
-    }
-    if( psz_modules ) free( psz_modules );
-
-    /*
-     * Load background interfaces
-     */
-    psz_modules = config_GetPsz( p_libvlc, "extraintf" );
-    psz_control = config_GetPsz( p_libvlc, "control" );
-
-    if( psz_modules && *psz_modules && psz_control && *psz_control )
-    {
-        psz_modules = (char *)realloc( psz_modules, strlen( psz_modules ) +
-                                                    strlen( psz_control ) + 1 );
-        sprintf( psz_modules, "%s:%s", psz_modules, psz_control );
-    }
-    else if( psz_control && *psz_control )
-    {
-        if( psz_modules ) free( psz_modules );
-        psz_modules = strdup( psz_control );
-    }
-
-    psz_parser = psz_modules;
-    while ( psz_parser && *psz_parser )
-    {
-        char *psz_module, *psz_temp;
-        psz_module = psz_parser;
-        psz_parser = strchr( psz_module, ':' );
-        if ( psz_parser )
-        {
-            *psz_parser = '\0';
-            psz_parser++;
-        }
-        psz_temp = (char *)malloc( strlen(psz_module) + sizeof(",none") );
-        if( psz_temp )
-        {
-            sprintf( psz_temp, "%s,none", psz_module );
-            VLC_AddIntf( 0, psz_temp, VLC_FALSE, VLC_FALSE );
-            free( psz_temp );
-        }
-    }
-    if ( psz_modules )
-    {
-        free( psz_modules );
-    }
-
-    /*
-     * Always load the hotkeys interface if it exists
-     */
-    VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE, VLC_FALSE );
-
-    /*
-     * If needed, load the Xscreensaver interface
-     * Currently, only for X
-     */
-#ifdef HAVE_X11_XLIB_H
-    if( config_GetInt( p_libvlc, "disable-screensaver" ) == 1 )
-    {
-        VLC_AddIntf( 0, "screensaver,none", VLC_FALSE, VLC_FALSE );
-    }
-#endif
-
-    if( config_GetInt( p_libvlc, "file-logging" ) == 1 )
-    {
-        VLC_AddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE );
-    }
-#ifdef HAVE_SYSLOG_H
-    if( config_GetInt( p_libvlc, "syslog" ) == 1 )
-    {
-        char *psz_logmode = "logmode=syslog";
-        AddIntfInternal( 0, "logger,none", VLC_FALSE, VLC_FALSE, 1, &psz_logmode );
-    }
-#endif
-
-    if( config_GetInt( p_libvlc, "show-intf" ) == 1 )
-    {
-        VLC_AddIntf( 0, "showintf,none", VLC_FALSE, VLC_FALSE );
-    }
-
-    if( config_GetInt( p_libvlc, "network-synchronisation") == 1 )
-    {
-        VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE );
-    }
-
-    /*
-     * FIXME: kludge to use a p_libvlc-local variable for the Mozilla plugin
-     */
-    var_Create( p_libvlc, "drawable", VLC_VAR_INTEGER );
-    var_Create( p_libvlc, "drawable-view-top", VLC_VAR_INTEGER );
-    var_Create( p_libvlc, "drawable-view-left", VLC_VAR_INTEGER );
-    var_Create( p_libvlc, "drawable-view-bottom", VLC_VAR_INTEGER );
-    var_Create( p_libvlc, "drawable-view-right", VLC_VAR_INTEGER );
-    var_Create( p_libvlc, "drawable-clip-top", VLC_VAR_INTEGER );
-    var_Create( p_libvlc, "drawable-clip-left", VLC_VAR_INTEGER );
-    var_Create( p_libvlc, "drawable-clip-bottom", VLC_VAR_INTEGER );
-    var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER );
-
-    /* Create volume callback system. */
-    var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
-
-    /*
-     * Get input filenames given as commandline arguments
-     */
-    GetFilenames( p_libvlc, i_argc, ppsz_argv );
-
-    /*
-     * Get --open argument
-     */
-    var_Create( p_libvlc, "open", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Get( p_libvlc, "open", &val );
-    if ( val.psz_string != NULL && *val.psz_string )
-    {
-        VLC_AddTarget( p_libvlc->i_object_id, val.psz_string, NULL, 0,
-                       PLAYLIST_INSERT, 0 );
-    }
-    if ( val.psz_string != NULL ) free( val.psz_string );
-
+    i_ret = libvlc_InternalInit( p_libvlc, i_argc, ppsz_argv );
     LIBVLC_FUNC_END;
-    return VLC_SUCCESS;
+    return i_ret;
 }
 
 /*****************************************************************************
@@ -879,7 +139,12 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
 int VLC_AddIntf( int i_object, char const *psz_module,
                  vlc_bool_t b_block, vlc_bool_t b_play )
 {
-    return AddIntfInternal( i_object, psz_module, b_block, b_play, 0, NULL );
+    int i_ret;
+    LIBVLC_FUNC;
+    i_ret = libvlc_InternalAddIntf( p_libvlc, psz_module, b_block, b_play,
+                                    0, NULL );
+    LIBVLC_FUNC_END;
+    return i_ret;
 }
 
 
@@ -902,60 +167,11 @@ int VLC_Die( int i_object )
  *****************************************************************************/
 int VLC_CleanUp( int i_object )
 {
-    intf_thread_t      * p_intf;
-    playlist_t         * p_playlist;
-    vout_thread_t      * p_vout;
-    aout_instance_t    * p_aout;
-    announce_handler_t * p_announce;
-    
+    int i_ret;
     LIBVLC_FUNC;
-
-    /* Ask the interfaces to stop and destroy them */
-    msg_Dbg( p_libvlc, "removing all interfaces" );
-    while( (p_intf = vlc_object_find( p_libvlc, VLC_OBJECT_INTF, FIND_CHILD )) )
-    {
-        intf_StopThread( p_intf );
-        vlc_object_detach( p_intf );
-        vlc_object_release( p_intf );
-        intf_Destroy( p_intf );
-    }
-
-    /* Free playlist */
-    msg_Dbg( p_libvlc, "removing playlist" );
-    playlist_ThreadDestroy( p_libvlc->p_playlist );
-
-    /* Free video outputs */
-    msg_Dbg( p_libvlc, "removing all video outputs" );
-    while( (p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
-    {
-        vlc_object_detach( p_vout );
-        vlc_object_release( p_vout );
-        vout_Destroy( p_vout );
-    }
-
-    /* Free audio outputs */
-    msg_Dbg( p_libvlc, "removing all audio outputs" );
-    while( (p_aout = vlc_object_find( p_libvlc, VLC_OBJECT_AOUT, FIND_CHILD )) )
-    {
-        vlc_object_detach( (vlc_object_t *)p_aout );
-        vlc_object_release( (vlc_object_t *)p_aout );
-        aout_Delete( p_aout );
-    }
-
-    stats_TimersDumpAll( p_libvlc );
-    stats_TimersClean( p_libvlc );
-
-    /* Free announce handler(s?) */
-    while( (p_announce = vlc_object_find( p_libvlc, VLC_OBJECT_ANNOUNCE,
-                                                 FIND_CHILD ) ) )
-    {
-        msg_Dbg( p_libvlc, "removing announce handler" );
-        vlc_object_detach( p_announce );
-        vlc_object_release( p_announce );
-        announce_HandlerDestroy( p_announce );
-    }
-
+    i_ret = libvlc_InternalCleanup( p_libvlc );
     LIBVLC_FUNC_END;
+    return i_ret;
 }
 
 /*****************************************************************************
@@ -967,49 +183,7 @@ int VLC_CleanUp( int i_object )
 int VLC_Destroy( int i_object )
 {
     LIBVLC_FUNC;
-    
-    /* Free allocated memory */
-    if( p_libvlc->p_memcpy_module )
-    {
-        module_Unneed( p_libvlc, p_libvlc->p_memcpy_module );
-        p_libvlc->p_memcpy_module = NULL;
-    }
-
-    /* Free module bank !  */
-    module_EndBank( p_libvlc );
-
-    FREENULL( p_libvlc->psz_homedir );
-    FREENULL( p_libvlc->psz_userdir );
-    FREENULL( p_libvlc->psz_configfile );
-    FREENULL( p_libvlc->p_hotkeys );
-
-    /* System specific cleaning code */
-    system_End( p_libvlc );
-
-    /*
-     * Free message queue.
-     * Nobody shall use msg_* afterward.
-     */
-    msg_Flush( p_libvlc );
-    msg_Destroy( p_libvlc_global );
-
-    /* Destroy global iconv */
-    LocaleDeinit();
-
-    /* Destroy mutexes */
-    vlc_mutex_destroy( &p_libvlc->config_lock );
-
-    vlc_object_detach( p_libvlc );
-
-    /* Release object before destroying it */
-    if( i_object ) vlc_object_release( p_libvlc );
-
-    vlc_object_destroy( p_libvlc );
-
-    /* Stop thread system: last one out please shut the door! */
-    vlc_threads_end( p_libvlc_global );
-
-    return VLC_SUCCESS;
+    return libvlc_InternalDestroy( p_libvlc, VLC_TRUE );
 }
 
 /*****************************************************************************
@@ -1215,13 +389,7 @@ float VLC_PositionGet( int i_object )
 {
     input_thread_t *p_input;
     vlc_value_t val;
-    libvlc_int_t *p_libvlc = vlc_current_object( i_object );
-
-    /* Check that the handle is valid */
-    if( !p_libvlc )
-    {
-        return VLC_ENOOBJ;
-    }
+    LIBVLC_FUNC;
 
     p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD );
 
@@ -1234,7 +402,7 @@ float VLC_PositionGet( int i_object )
     var_Get( p_input, "position", &val );
     vlc_object_release( p_input );
 
-    if( i_object ) vlc_object_release( p_libvlc );
+    LIBVLC_FUNC_END;
     return val.f_float;
 }
 
@@ -1493,7 +661,7 @@ int VLC_PlaylistIndex( int i_object )
 }
 
 /**
- * Total amount of items in the playlist
+ * Total number of items in the playlist
  *
  * \param i_object a vlc object id
  * \return amount of playlist items
@@ -1501,126 +669,46 @@ int VLC_PlaylistIndex( int i_object )
 int VLC_PlaylistNumberOfItems( int i_object )
 {
     int i_size;
-    playlist_t * p_playlist;
-    libvlc_int_t *p_libvlc = vlc_current_object( i_object );
-
-    /* Check that the handle is valid */
-    if( !p_libvlc )
-    {
-        return VLC_ENOOBJ;
-    }
-
-    p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
-
-    if( !p_playlist )
-    {
-        if( i_object ) vlc_object_release( p_libvlc );
-        return VLC_ENOOBJ;
-    }
-
-    i_size = p_playlist->i_size;
-    vlc_object_release( p_playlist );
-
-    if( i_object ) vlc_object_release( p_libvlc );
+    LIBVLC_PLAYLIST_FUNC;
+    i_size = p_libvlc->p_playlist->i_size;
+    LIBVLC_PLAYLIST_FUNC_END;
     return i_size;
 }
 
 /**
- * Next playlist item
- *
- * Skip to the next playlistitem and play it.
- *
+ * Go to next playlist item
  * \param i_object a vlc object id
  * \return VLC_SUCCESS on success
  */
 int VLC_PlaylistNext( int i_object )
 {
-    playlist_t * p_playlist;
-    libvlc_int_t *p_libvlc = vlc_current_object( i_object );
-
-    /* Check that the handle is valid */
-    if( !p_libvlc )
-    {
-        return VLC_ENOOBJ;
-    }
-
-    p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
-
-    if( !p_playlist )
-    {
-        if( i_object ) vlc_object_release( p_libvlc );
-        return VLC_ENOOBJ;
-    }
-
-    playlist_Next( p_playlist );
-    vlc_object_release( p_playlist );
-
-    if( i_object ) vlc_object_release( p_libvlc );
+    LIBVLC_PLAYLIST_FUNC;
+    playlist_Next( p_libvlc->p_playlist );
+    LIBVLC_PLAYLIST_FUNC_END;
     return VLC_SUCCESS;
 }
 
 /**
- * Previous playlist item
- *
- * Skip to the previous playlistitem and play it.
- *
+ * Go to previous playlist item
  * \param i_object a vlc object id
  * \return VLC_SUCCESS on success
  */
 int VLC_PlaylistPrev( int i_object )
 {
-    playlist_t * p_playlist;
-    libvlc_int_t *p_libvlc = vlc_current_object( i_object );
-
-    /* Check that the handle is valid */
-    if( !p_libvlc )
-    {
-        return VLC_ENOOBJ;
-    }
-
-    p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
-
-    if( !p_playlist )
-    {
-        if( i_object ) vlc_object_release( p_libvlc );
-        return VLC_ENOOBJ;
-    }
-
-    playlist_Prev( p_playlist );
-    vlc_object_release( p_playlist );
-
-    if( i_object ) vlc_object_release( p_libvlc );
+    LIBVLC_PLAYLIST_FUNC;
+    playlist_Prev( p_libvlc->p_playlist );
+    LIBVLC_PLAYLIST_FUNC_END;
     return VLC_SUCCESS;
 }
 
-
-/*****************************************************************************
- * VLC_PlaylistClear: Empty the playlist
- *****************************************************************************/
+/**
+ * Empty the playlist
+ */
 int VLC_PlaylistClear( int i_object )
 {
-    playlist_t * p_playlist;
-    libvlc_int_t *p_libvlc = vlc_current_object( i_object );
-
-    /* Check that the handle is valid */
-    if( !p_libvlc )
-    {
-        return VLC_ENOOBJ;
-    }
-
-    p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
-
-    if( !p_playlist )
-    {
-        if( i_object ) vlc_object_release( p_libvlc );
-        return VLC_ENOOBJ;
-    }
-
-    playlist_Clear( p_playlist );
-
-    vlc_object_release( p_playlist );
-
-    if( i_object ) vlc_object_release( p_libvlc );
+    LIBVLC_PLAYLIST_FUNC;
+    playlist_Clear( p_libvlc->p_playlist );
+    LIBVLC_PLAYLIST_FUNC_END;
     return VLC_SUCCESS;
 }
 
@@ -1634,21 +722,14 @@ int VLC_PlaylistClear( int i_object )
 int VLC_VolumeSet( int i_object, int i_volume )
 {
     audio_volume_t i_vol = 0;
-    libvlc_int_t *p_libvlc = vlc_current_object( i_object );
-
-    /* Check that the handle is valid */
-    if( !p_libvlc )
-    {
-        return VLC_ENOOBJ;
-    }
+    LIBVLC_FUNC;
 
     if( i_volume >= 0 && i_volume <= 200 )
     {
         i_vol = i_volume * AOUT_VOLUME_MAX / 200;
         aout_VolumeSet( p_libvlc, i_vol );
     }
-
-    if( i_object ) vlc_object_release( p_libvlc );
+    LIBVLC_FUNC_END;
     return i_vol * 200 / AOUT_VOLUME_MAX;
 }
 
@@ -1663,17 +744,9 @@ int VLC_VolumeSet( int i_object, int i_volume )
 int VLC_VolumeGet( int i_object )
 {
     audio_volume_t i_volume;
-    libvlc_int_t *p_libvlc = vlc_current_object( i_object );
-
-    /* Check that the handle is valid */
-    if( !p_libvlc )
-    {
-        return VLC_ENOOBJ;
-    }
-
+    LIBVLC_FUNC;
     aout_VolumeGet( p_libvlc, &i_volume );
-
-    if( i_object ) vlc_object_release( p_libvlc );
+    LIBVLC_FUNC_END;
     return i_volume*200/AOUT_VOLUME_MAX;
 }
 
@@ -1685,17 +758,9 @@ int VLC_VolumeGet( int i_object )
  */
 int VLC_VolumeMute( int i_object )
 {
-    libvlc_int_t *p_libvlc = vlc_current_object( i_object );
-
-    /* Check that the handle is valid */
-    if( !p_libvlc )
-    {
-        return VLC_ENOOBJ;
-    }
-
+    LIBVLC_FUNC;
     aout_VolumeMute( p_libvlc, NULL );
-
-    if( i_object ) vlc_object_release( p_libvlc );
+    LIBVLC_FUNC_END;
     return VLC_SUCCESS;
 }
 
@@ -1705,13 +770,7 @@ int VLC_VolumeMute( int i_object )
 int VLC_FullScreen( int i_object )
 {
     vout_thread_t *p_vout;
-    libvlc_int_t *p_libvlc = vlc_current_object( i_object );
-
-    if( !p_libvlc )
-    {
-        return VLC_ENOOBJ;
-    }
-
+    LIBVLC_FUNC;
     p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD );
 
     if( !p_vout )
@@ -1722,754 +781,6 @@ int VLC_FullScreen( int i_object )
 
     p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
     vlc_object_release( p_vout );
-
-    if( i_object ) vlc_object_release( p_libvlc );
-    return VLC_SUCCESS;
-}
-
-/* following functions are local */
-
-
-static int  AddIntfInternal( int i_object, char const *psz_module,
-                             vlc_bool_t b_block, vlc_bool_t b_play,
-                             int i_options, char **ppsz_options )
-{
-    int i_err;
-    intf_thread_t *p_intf;
-    libvlc_int_t *p_libvlc = vlc_current_object( i_object );
-
-    if( !p_libvlc )
-    {
-        return VLC_ENOOBJ;
-    }
-
-#ifndef WIN32
-    if( p_libvlc->p_libvlc_global->b_daemon && b_block && !psz_module )
-    {
-        /* Daemon mode hack.
-         * We prefer the dummy interface if none is specified. */
-        char *psz_interface = config_GetPsz( p_libvlc, "intf" );
-        if( !psz_interface || !*psz_interface ) psz_module = "dummy";
-        if( psz_interface ) free( psz_interface );
-    }
-#endif
-
-    /* Try to create the interface */
-    p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf",
-                          i_options, ppsz_options );
-
-    if( p_intf == NULL )
-    {
-        msg_Err( p_libvlc, "interface \"%s\" initialization failed", psz_module );
-        if( i_object ) vlc_object_release( p_libvlc );
-        return VLC_EGENERIC;
-    }
-
-    /* Interface doesn't handle play on start so do it ourselves */
-    if( !p_intf->b_play && b_play ) VLC_Play( i_object );
-
-    /* Try to run the interface */
-    p_intf->b_play = b_play;
-    p_intf->b_block = b_block;
-    i_err = intf_RunThread( p_intf );
-    if( i_err )
-    {
-        vlc_object_detach( p_intf );
-        intf_Destroy( p_intf );
-        if( i_object ) vlc_object_release( p_libvlc );
-        return i_err;
-    }
-
-    if( i_object ) vlc_object_release( p_libvlc );
-    return VLC_SUCCESS;
-};
-
-
-/*****************************************************************************
- * SetLanguage: set the interface language.
- *****************************************************************************
- * We set the LC_MESSAGES locale category for interface messages and buttons,
- * as well as the LC_CTYPE category for string sorting and possible wide
- * character support.
- *****************************************************************************/
-static void SetLanguage ( char const *psz_lang )
-{
-#if defined( ENABLE_NLS ) \
-     && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
-
-    char *          psz_path;
-#if defined( __APPLE__ ) || defined ( WIN32 ) || defined( SYS_BEOS )
-    char            psz_tmp[1024];
-#endif
-
-    if( psz_lang && !*psz_lang )
-    {
-#   if defined( HAVE_LC_MESSAGES )
-        setlocale( LC_MESSAGES, psz_lang );
-#   endif
-        setlocale( LC_CTYPE, psz_lang );
-    }
-    else if( psz_lang )
-    {
-#ifdef __APPLE__
-        /* I need that under Darwin, please check it doesn't disturb
-         * other platforms. --Meuuh */
-        setenv( "LANG", psz_lang, 1 );
-
-#elif defined( SYS_BEOS ) || defined( WIN32 )
-        /* We set LC_ALL manually because it is the only way to set
-         * the language at runtime under eg. Windows. Beware that this
-         * makes the environment unconsistent when libvlc is unloaded and
-         * should probably be moved to a safer place like vlc.c. */
-        static char psz_lcall[20];
-        snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
-        psz_lcall[19] = '\0';
-        putenv( psz_lcall );
-#endif
-
-        setlocale( LC_ALL, psz_lang );
-    }
-
-    /* Specify where to find the locales for current domain */
-#if !defined( __APPLE__ ) && !defined( WIN32 ) && !defined( SYS_BEOS )
-    psz_path = LOCALEDIR;
-#else
-    snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc_global.psz_vlcpath,
-              "locale" );
-    psz_path = psz_tmp;
-#endif
-    if( !bindtextdomain( PACKAGE_NAME, psz_path ) )
-    {
-        fprintf( stderr, "warning: couldn't bind domain %s in directory %s\n",
-                 PACKAGE_NAME, psz_path );
-    }
-
-    /* Set the default domain */
-    bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
-#endif
-}
-
-/*****************************************************************************
- * GetFilenames: parse command line options which are not flags
- *****************************************************************************
- * Parse command line for input files as well as their associated options.
- * An option always follows its associated input and begins with a ":".
- *****************************************************************************/
-static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, char *ppsz_argv[] )
-{
-    int i_opt, i_options;
-
-    /* We assume that the remaining parameters are filenames
-     * and their input options */
-    for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- )
-    {
-        const char *psz_target;
-        i_options = 0;
-
-        /* Count the input options */
-        while( *ppsz_argv[ i_opt ] == ':' && i_opt > optind )
-        {
-            i_options++;
-            i_opt--;
-        }
-
-        /* TODO: write an internal function of this one, to avoid
-         *       unnecessary lookups. */
-        /* FIXME: should we convert options to UTF-8 as well ?? */
-        psz_target = FromLocale( ppsz_argv[ i_opt ] );
-        VLC_AddTarget( p_vlc->i_object_id, psz_target,
-                       (char const **)( i_options ? &ppsz_argv[i_opt + 1] :
-                                        NULL ), i_options,
-                       PLAYLIST_INSERT, 0 );
-        LocaleFree( psz_target );
-    }
-
-    return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Help: print program help
- *****************************************************************************
- * Print a short inline help. Message interface is initialized at this stage.
- *****************************************************************************/
-static void Help( libvlc_int_t *p_this, char const *psz_help_name )
-{
-#ifdef WIN32
-    ShowConsole( VLC_TRUE );
-#endif
-
-    if( psz_help_name && !strcmp( psz_help_name, "help" ) )
-    {
-        utf8_fprintf( stdout, VLC_USAGE, p_this->psz_object_name );
-        Usage( p_this, "help" );
-        Usage( p_this, "main" );
-    }
-    else if( psz_help_name && !strcmp( psz_help_name, "longhelp" ) )
-    {
-        utf8_fprintf( stdout, VLC_USAGE, p_this->psz_object_name );
-        Usage( p_this, NULL );
-    }
-    else if( psz_help_name )
-    {
-        Usage( p_this, psz_help_name );
-    }
-
-#ifdef WIN32        /* Pause the console because it's destroyed when we exit */
-    PauseConsole();
-#endif
-}
-
-/*****************************************************************************
- * Usage: print module usage
- *****************************************************************************
- * Print a short inline help. Message interface is initialized at this stage.
- *****************************************************************************/
-static void Usage( libvlc_int_t *p_this, char const *psz_module_name )
-{
-#define FORMAT_STRING "  %s --%s%s%s%s%s%s%s "
-    /* short option ------'    |     | | | |  | |
-     * option name ------------'     | | | |  | |
-     * <bra -------------------------' | | |  | |
-     * option type or "" --------------' | |  | |
-     * ket> -----------------------------' |  | |
-     * padding spaces ---------------------'  | |
-     * comment -------------------------------' |
-     * comment suffix --------------------------'
-     *
-     * The purpose of having bra and ket is that we might i18n them as well.
-     */
-#define LINE_START 8
-#define PADDING_SPACES 25
-    vlc_list_t *p_list;
-    module_t *p_parser;
-    module_config_t *p_item;
-    char psz_spaces_text[PADDING_SPACES+LINE_START+1];
-    char psz_spaces_longtext[LINE_START+3];
-    char psz_format[sizeof(FORMAT_STRING)];
-    char psz_buffer[10000];
-    char psz_short[4];
-    int i_index;
-    int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1);
-    vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" );
-    vlc_bool_t b_description;
-
-    memset( psz_spaces_text, ' ', PADDING_SPACES+LINE_START );
-    psz_spaces_text[PADDING_SPACES+LINE_START] = '\0';
-    memset( psz_spaces_longtext, ' ', LINE_START+2 );
-    psz_spaces_longtext[LINE_START+2] = '\0';
-
-    strcpy( psz_format, FORMAT_STRING );
-
-    /* List all modules */
-    p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
-
-    /* Enumerate the config for each module */
-    for( i_index = 0; i_index < p_list->i_count; i_index++ )
-    {
-        vlc_bool_t b_help_module;
-
-        p_parser = (module_t *)p_list->p_values[i_index].p_object ;
-
-        if( psz_module_name && strcmp( psz_module_name,
-                                       p_parser->psz_object_name ) )
-        {
-            continue;
-        }
-
-        /* Ignore modules without config options */
-        if( !p_parser->i_config_items )
-        {
-            continue;
-        }
-
-        /* Ignore modules with only advanced config options if requested */
-        if( !b_advanced )
-        {
-            for( p_item = p_parser->p_config;
-                 p_item->i_type != CONFIG_HINT_END;
-                 p_item++ )
-            {
-                if( (p_item->i_type & CONFIG_ITEM) &&
-                    !p_item->b_advanced ) break;
-            }
-            if( p_item->i_type == CONFIG_HINT_END ) continue;
-        }
-
-        /* Print name of module */
-        if( strcmp( "main", p_parser->psz_object_name ) )
-        utf8_fprintf( stdout, "\n %s\n", p_parser->psz_longname );
-
-        b_help_module = !strcmp( "help", p_parser->psz_object_name );
-
-        /* Print module options */
-        for( p_item = p_parser->p_config;
-             p_item->i_type != CONFIG_HINT_END;
-             p_item++ )
-        {
-            char *psz_text, *psz_spaces = psz_spaces_text;
-            char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
-            char *psz_suf = "", *psz_prefix = NULL;
-            signed int i;
-
-            /* Skip deprecated options */
-            if( p_item->psz_current )
-            {
-                continue;
-            }
-            /* Skip advanced options if requested */
-            if( p_item->b_advanced && !b_advanced )
-            {
-                continue;
-            }
-
-            switch( p_item->i_type )
-            {
-            case CONFIG_HINT_CATEGORY:
-            case CONFIG_HINT_USAGE:
-                if( !strcmp( "main", p_parser->psz_object_name ) )
-                utf8_fprintf( stdout, "\n %s\n", p_item->psz_text );
-                break;
-
-            case CONFIG_ITEM_STRING:
-            case CONFIG_ITEM_FILE:
-            case CONFIG_ITEM_DIRECTORY:
-            case CONFIG_ITEM_MODULE: /* We could also have "=<" here */
-            case CONFIG_ITEM_MODULE_CAT:
-            case CONFIG_ITEM_MODULE_LIST:
-            case CONFIG_ITEM_MODULE_LIST_CAT:
-                psz_bra = " <"; psz_type = _("string"); psz_ket = ">";
-
-                if( p_item->ppsz_list )
-                {
-                    psz_bra = " {";
-                    psz_type = psz_buffer;
-                    psz_type[0] = '\0';
-                    for( i = 0; p_item->ppsz_list[i]; i++ )
-                    {
-                        if( i ) strcat( psz_type, "," );
-                        strcat( psz_type, p_item->ppsz_list[i] );
-                    }
-                    psz_ket = "}";
-                }
-                break;
-            case CONFIG_ITEM_INTEGER:
-            case CONFIG_ITEM_KEY: /* FIXME: do something a bit more clever */
-                psz_bra = " <"; psz_type = _("integer"); psz_ket = ">";
-
-                if( p_item->i_list )
-                {
-                    psz_bra = " {";
-                    psz_type = psz_buffer;
-                    psz_type[0] = '\0';
-                    for( i = 0; p_item->ppsz_list_text[i]; i++ )
-                    {
-                        if( i ) strcat( psz_type, ", " );
-                        sprintf( psz_type + strlen(psz_type), "%i (%s)",
-                                 p_item->pi_list[i],
-                                 p_item->ppsz_list_text[i] );
-                    }
-                    psz_ket = "}";
-                }
-                break;
-            case CONFIG_ITEM_FLOAT:
-                psz_bra = " <"; psz_type = _("float"); psz_ket = ">";
-                break;
-            case CONFIG_ITEM_BOOL:
-                psz_bra = ""; psz_type = ""; psz_ket = "";
-                if( !b_help_module )
-                {
-                    psz_suf = p_item->i_value ? _(" (default enabled)") :
-                                                _(" (default disabled)");
-                }
-                break;
-            }
-
-            if( !psz_type )
-            {
-                continue;
-            }
-
-            /* Add short option if any */
-            if( p_item->i_short )
-            {
-                sprintf( psz_short, "-%c,", p_item->i_short );
-            }
-            else
-            {
-                strcpy( psz_short, "   " );
-            }
-
-            i = PADDING_SPACES - strlen( p_item->psz_name )
-                 - strlen( psz_bra ) - strlen( psz_type )
-                 - strlen( psz_ket ) - 1;
-
-            if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module )
-            {
-                psz_prefix =  ", --no-";
-                i -= strlen( p_item->psz_name ) + strlen( psz_prefix );
-            }
-
-            if( i < 0 )
-            {
-                psz_spaces[0] = '\n';
-                i = 0;
-            }
-            else
-            {
-                psz_spaces[i] = '\0';
-            }
-
-            if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module )
-            {
-                utf8_fprintf( stdout, psz_format, psz_short, p_item->psz_name,
-                         psz_prefix, p_item->psz_name, psz_bra, psz_type,
-                         psz_ket, psz_spaces );
-            }
-            else
-            {
-                utf8_fprintf( stdout, psz_format, psz_short, p_item->psz_name,
-                         "", "", psz_bra, psz_type, psz_ket, psz_spaces );
-            }
-
-            psz_spaces[i] = ' ';
-
-            /* We wrap the rest of the output */
-            sprintf( psz_buffer, "%s%s", p_item->psz_text, psz_suf );
-            b_description = config_GetInt( p_this, "help-verbose" );
-
- description:
-            psz_text = psz_buffer;
-            while( *psz_text )
-            {
-                char *psz_parser, *psz_word;
-                size_t i_end = strlen( psz_text );
-
-                /* If the remaining text fits in a line, print it. */
-                if( i_end <= (size_t)i_width )
-                {
-                    utf8_fprintf( stdout, "%s\n", psz_text );
-                    break;
-                }
-
-                /* Otherwise, eat as many words as possible */
-                psz_parser = psz_text;
-                do
-                {
-                    psz_word = psz_parser;
-                    psz_parser = strchr( psz_word, ' ' );
-                    /* If no space was found, we reached the end of the text
-                     * block; otherwise, we skip the space we just found. */
-                    psz_parser = psz_parser ? psz_parser + 1
-                                            : psz_text + i_end;
-
-                } while( psz_parser - psz_text <= i_width );
-
-                /* We cut a word in one of these cases:
-                 *  - it's the only word in the line and it's too long.
-                 *  - we used less than 80% of the width and the word we are
-                 *    going to wrap is longer than 40% of the width, and even
-                 *    if the word would have fit in the next line. */
-                if( psz_word == psz_text
-                     || ( psz_word - psz_text < 80 * i_width / 100
-                           && psz_parser - psz_word > 40 * i_width / 100 ) )
-                {
-                    char c = psz_text[i_width];
-                    psz_text[i_width] = '\0';
-                    utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces );
-                    psz_text += i_width;
-                    psz_text[0] = c;
-                }
-                else
-                {
-                    psz_word[-1] = '\0';
-                    utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces );
-                    psz_text = psz_word;
-                }
-            }
-
-            if( b_description && p_item->psz_longtext )
-            {
-                sprintf( psz_buffer, "%s%s", p_item->psz_longtext, psz_suf );
-                b_description = VLC_FALSE;
-                psz_spaces = psz_spaces_longtext;
-                utf8_fprintf( stdout, "%s", psz_spaces );
-                goto description;
-            }
-        }
-    }
-
-    /* Release the module list */
-    vlc_list_release( p_list );
-}
-
-/*****************************************************************************
- * ListModules: list the available modules with their description
- *****************************************************************************
- * Print a list of all available modules (builtins and plugins) and a short
- * description for each one.
- *****************************************************************************/
-static void ListModules( libvlc_int_t *p_this )
-{
-    vlc_list_t *p_list;
-    module_t *p_parser;
-    char psz_spaces[22];
-    int i_index;
-
-    memset( psz_spaces, ' ', 22 );
-
-#ifdef WIN32
-    ShowConsole( VLC_TRUE );
-#endif
-
-    /* List all modules */
-    p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
-
-    /* Enumerate each module */
-    for( i_index = 0; i_index < p_list->i_count; i_index++ )
-    {
-        int i;
-
-        p_parser = (module_t *)p_list->p_values[i_index].p_object ;
-
-        /* Nasty hack, but right now I'm too tired to think about a nice
-         * solution */
-        i = 22 - strlen( p_parser->psz_object_name ) - 1;
-        if( i < 0 ) i = 0;
-        psz_spaces[i] = 0;
-
-        utf8_fprintf( stdout, "  %s%s %s\n", p_parser->psz_object_name,
-                         psz_spaces, p_parser->psz_longname );
-
-        psz_spaces[i] = ' ';
-    }
-
-    vlc_list_release( p_list );
-
-#ifdef WIN32        /* Pause the console because it's destroyed when we exit */
-    PauseConsole();
-#endif
-}
-
-/*****************************************************************************
- * Version: print complete program version
- *****************************************************************************
- * Print complete program version and build number.
- *****************************************************************************/
-static void Version( void )
-{
-#ifdef WIN32
-    ShowConsole( VLC_TRUE );
-#endif
-
-    utf8_fprintf( stdout, _("VLC version %s\n"), VLC_Version() );
-    utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"),
-             VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
-    utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
-#ifndef HAVE_SHARED_LIBVLC
-    if( strcmp( VLC_Changeset(), "exported" ) )
-        utf8_fprintf( stdout, _("Based upon svn changeset [%s]\n"),
-                 VLC_Changeset() );
-#endif
-    utf8_fprintf( stdout, LICENSE_MSG );
-
-#ifdef WIN32        /* Pause the console because it's destroyed when we exit */
-    PauseConsole();
-#endif
-}
-
-/*****************************************************************************
- * ShowConsole: On Win32, create an output console for debug messages
- *****************************************************************************
- * This function is useful only on Win32.
- *****************************************************************************/
-#ifdef WIN32 /*  */
-static void ShowConsole( vlc_bool_t b_dofile )
-{
-#   ifndef UNDER_CE
-    FILE *f_help;
-
-    if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
-
-    AllocConsole();
-
-    freopen( "CONOUT$", "w", stderr );
-    freopen( "CONIN$", "r", stdin );
-
-    if( b_dofile && (f_help = fopen( "vlc-help.txt", "wt" )) )
-    {
-        fclose( f_help );
-        freopen( "vlc-help.txt", "wt", stdout );
-        utf8_fprintf( stderr, _("\nDumped content to vlc-help.txt file.\n") );
-    }
-
-    else freopen( "CONOUT$", "w", stdout );
-
-#   endif
-}
-#endif
-
-/*****************************************************************************
- * PauseConsole: On Win32, wait for a key press before closing the console
- *****************************************************************************
- * This function is useful only on Win32.
- *****************************************************************************/
-#ifdef WIN32 /*  */
-static void PauseConsole( void )
-{
-#   ifndef UNDER_CE
-
-    if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
-
-    utf8_fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
-    getchar();
-    fclose( stdout );
-
-#   endif
-}
-#endif
-
-/*****************************************************************************
- * ConsoleWidth: Return the console width in characters
- *****************************************************************************
- * We use the stty shell command to get the console width; if this fails or
- * if the width is less than 80, we default to 80.
- *****************************************************************************/
-static int ConsoleWidth( void )
-{
-    int i_width = 80;
-
-#ifndef WIN32
-    char buf[20], *psz_parser;
-    FILE *file;
-    int i_ret;
-
-    file = popen( "stty size 2>/dev/null", "r" );
-    if( file )
-    {
-        i_ret = fread( buf, 1, 20, file );
-        if( i_ret > 0 )
-        {
-            buf[19] = '\0';
-            psz_parser = strchr( buf, ' ' );
-            if( psz_parser )
-            {
-                i_ret = atoi( psz_parser + 1 );
-                if( i_ret >= 80 )
-                {
-                    i_width = i_ret;
-                }
-            }
-        }
-
-        pclose( file );
-    }
-#endif
-
-    return i_width;
-}
-
-static int VerboseCallback( vlc_object_t *p_this, const char *psz_variable,
-                     vlc_value_t old_val, vlc_value_t new_val, void *param)
-{
-    libvlc_int_t *p_vlc = (libvlc_int_t *)p_this;
-
-    if( new_val.i_int >= -1 )
-    {
-        p_vlc->p_libvlc_global->i_verbose = __MIN( new_val.i_int, 2 );
-    }
+    LIBVLC_FUNC_END;
     return VLC_SUCCESS;
 }
-
-/*****************************************************************************
- * InitDeviceValues: initialize device values
- *****************************************************************************
- * This function inits the dvd, vcd and cd-audio values
- *****************************************************************************/
-static void InitDeviceValues( libvlc_int_t *p_vlc )
-{
-#ifdef HAVE_HAL
-    LibHalContext * ctx;
-    int i, i_devices;
-    char **devices;
-    char *block_dev;
-    dbus_bool_t b_dvd;
-    DBusConnection *p_connection;
-    DBusError       error;
-
-#ifdef HAVE_HAL_1
-    ctx =  libhal_ctx_new();
-    if( !ctx ) return;
-    dbus_error_init( &error );
-    p_connection = dbus_bus_get ( DBUS_BUS_SYSTEM, &error );
-    if( dbus_error_is_set( &error ) )
-    {
-        dbus_error_free( &error );
-        return;
-    }
-    libhal_ctx_set_dbus_connection( ctx, p_connection );
-    if( libhal_ctx_init( ctx, &error ) )
-#else
-    if( ( ctx = hal_initialize( NULL, FALSE ) ) )
-#endif
-    {
-#ifdef HAVE_HAL_1
-        if( ( devices = libhal_get_all_devices( ctx, &i_devices, NULL ) ) )
-#else
-        if( ( devices = hal_get_all_devices( ctx, &i_devices ) ) )
-#endif
-        {
-            for( i = 0; i < i_devices; i++ )
-            {
-#ifdef HAVE_HAL_1
-                if( !libhal_device_property_exists( ctx, devices[i],
-                                                "storage.cdrom.dvd", NULL ) )
-#else
-                if( !hal_device_property_exists( ctx, devices[ i ],
-                                                "storage.cdrom.dvd" ) )
-#endif
-                {
-                    continue;
-                }
-#ifdef HAVE_HAL_1
-                b_dvd = libhal_device_get_property_bool( ctx, devices[ i ],
-                                                 "storage.cdrom.dvd", NULL  );
-                block_dev = libhal_device_get_property_string( ctx,
-                                devices[ i ], "block.device" , NULL );
-#else
-                b_dvd = hal_device_get_property_bool( ctx, devices[ i ],
-                                                      "storage.cdrom.dvd" );
-                block_dev = hal_device_get_property_string( ctx, devices[ i ],
-                                                            "block.device" );
-#endif
-                if( b_dvd )
-                {
-                    config_PutPsz( p_vlc, "dvd", block_dev );
-                }
-
-                config_PutPsz( p_vlc, "vcd", block_dev );
-                config_PutPsz( p_vlc, "cd-audio", block_dev );
-#ifdef HAVE_HAL_1
-                libhal_free_string( block_dev );
-#else
-                hal_free_string( block_dev );
-#endif
-            }
-#ifdef HAVE_HAL_1
-            libhal_free_string_array( devices );
-#else
-            hal_free_string_array( devices );
-#endif
-        }
-
-#ifdef HAVE_HAL_1
-        libhal_ctx_shutdown( ctx, NULL );
-#else
-        hal_shutdown( ctx );
-#endif
-    }
-    else
-    {
-        msg_Warn( p_vlc, "Unable to get HAL device properties" );
-    }
-#endif
-}