X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=38e2b8bbc6d4dda137b72ed734d8cefc27231c19;hb=3048882f57f5ec815fe21e1a803fddaff7a58f61;hp=96dae5c2364eebd801174025035a2decb934580f;hpb=633a5efc47a2748fcf87cf51e93036a9a8eb8bef;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 96dae5c236..38e2b8bbc6 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -43,7 +43,6 @@ #include "modules/modules.h" #include "config/configuration.h" -#include /* ENOMEM */ #include /* sprintf() */ #include #include /* free() */ @@ -58,18 +57,12 @@ # include #endif -#ifdef WIN32 /* optind, getopt(), included in unistd.h */ -# include "extras/getopt.h" -#endif +#include "config/vlc_getopt.h" #ifdef HAVE_LOCALE_H # include #endif -#ifdef ENABLE_NLS -# include /* bindtextdomain */ -#endif - #ifdef HAVE_DBUS /* used for one-instance mode */ # include @@ -82,6 +75,7 @@ #include "audio_output/aout_internal.h" #include +#include #include #include @@ -210,7 +204,6 @@ void vlc_release (gc_object_t *p_gc) ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) static void SetLanguage ( char const * ); #endif -static inline int LoadMessages (void); static int GetFilenames ( libvlc_int_t *, int, const char *[] ); static void Help ( libvlc_int_t *, char const *psz_help_name ); static void Usage ( libvlc_int_t *, char const *psz_search ); @@ -224,6 +217,7 @@ static void PauseConsole ( void ); static int ConsoleWidth ( void ); static vlc_mutex_t global_lock = VLC_STATIC_MUTEX; +extern const char psz_vlc_changeset[]; /** * Allocate a libvlc instance, initialize global data if needed @@ -246,7 +240,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) } /* Allocate a libvlc instance object */ - p_libvlc = __vlc_custom_create( NULL, sizeof (*priv), + p_libvlc = vlc_custom_create( (vlc_object_t *)NULL, sizeof (*priv), VLC_OBJECT_GENERIC, "libvlc" ); if( p_libvlc != NULL ) i_instances++; @@ -261,7 +255,9 @@ libvlc_int_t * libvlc_InternalCreate( void ) priv->p_vlm = NULL; /* Initialize message queue */ - msg_Create( p_libvlc ); + priv->msg_bank = msg_Create (); + if (unlikely(priv->msg_bank == NULL)) + goto error; /* Find verbosity from VLC_VERBOSE environment variable */ psz_env = getenv( "VLC_VERBOSE" ); @@ -277,9 +273,11 @@ libvlc_int_t * libvlc_InternalCreate( void ) /* Initialize mutexes */ vlc_mutex_init( &priv->timer_lock ); - vlc_cond_init( &priv->exiting ); return p_libvlc; +error: + vlc_object_release (p_libvlc); + return NULL; } /** @@ -315,7 +313,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Support for gettext */ - LoadMessages (); + vlc_bindtextdomain (PACKAGE_NAME); /* 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 @@ -329,34 +327,33 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, return VLC_EGENERIC; } - priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); + priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" ); /* Announce who we are - Do it only for first instance ? */ + msg_Dbg( p_libvlc, "VLC media player - %s", VERSION_MESSAGE ); msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE ); - msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE ); + msg_Dbg( p_libvlc, "revision %s", psz_vlc_changeset ); + msg_Dbg( p_libvlc, "configured with %s", CONFIGURE_LINE ); /*xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") ); /* Check for short help option */ - if( config_GetInt( p_libvlc, "help" ) > 0 ) + if( var_InheritBool( p_libvlc, "help" ) ) { Help( p_libvlc, "help" ); b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Check for version option */ - else if( config_GetInt( p_libvlc, "version" ) > 0 ) + else if( var_InheritBool( p_libvlc, "version" ) ) { Version(); b_exit = true; i_ret = VLC_EEXITSUCCESS; } - /* Check for plugins cache options */ - bool b_cache_delete = config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0; - /* Check for daemon mode */ #ifndef WIN32 - if( config_GetInt( p_libvlc, "daemon" ) > 0 ) + if( var_InheritBool( p_libvlc, "daemon" ) ) { #ifdef HAVE_DAEMON char *psz_pidfile = NULL; @@ -376,7 +373,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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" ); + pidfile = vlc_fopen( psz_pidfile,"w" ); if( pidfile != NULL ) { utf8_fprintf( pidfile, "%d", (int)i_pid ); @@ -429,13 +426,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #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. */ - - if( !config_GetInt( p_libvlc, "ignore-config" ) ) + if( !var_InheritBool( p_libvlc, "ignore-config" ) ) config_LoadConfigFile( p_libvlc, "main" ); - config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); - priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); + priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" ); /* Check if the user specified a custom language */ psz_language = var_CreateGetNonEmptyString( p_libvlc, "language" ); @@ -446,13 +439,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* 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, false ); - module_InitBank( p_libvlc ); - if( !config_GetInt( p_libvlc, "ignore-config" ) ) - config_LoadConfigFile( p_libvlc, "main" ); - config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); - priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); } free( psz_language ); # endif @@ -464,7 +450,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, * list of configuration options exported by each module and loads their * default values. */ - module_LoadPlugins( p_libvlc, b_cache_delete ); + module_LoadPlugins( p_libvlc ); if( p_libvlc->b_die ) { b_exit = true; @@ -476,7 +462,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, msg_Dbg( p_libvlc, "module bank initialized (%zu modules)", module_count ); /* Check for help on modules */ - if( (p_tmp = var_CreateGetNonEmptyString( p_libvlc, "module" )) ) + if( (p_tmp = var_InheritString( p_libvlc, "module" )) ) { Help( p_libvlc, p_tmp ); free( p_tmp ); @@ -484,29 +470,31 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, i_ret = VLC_EEXITSUCCESS; } /* Check for full help option */ - else if( config_GetInt( p_libvlc, "full-help" ) > 0 ) + else if( var_InheritBool( p_libvlc, "full-help" ) ) { - config_PutInt( p_libvlc, "advanced", 1); - config_PutInt( p_libvlc, "help-verbose", 1); + var_Create( p_libvlc, "advanced", VLC_VAR_BOOL ); + var_SetBool( p_libvlc, "advanced", true ); + var_Create( p_libvlc, "help-verbose", VLC_VAR_BOOL ); + var_SetBool( p_libvlc, "help-verbose", true ); Help( p_libvlc, "full-help" ); b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Check for long help option */ - else if( config_GetInt( p_libvlc, "longhelp" ) > 0 ) + else if( var_InheritBool( p_libvlc, "longhelp" ) ) { Help( p_libvlc, "longhelp" ); b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Check for module list option */ - else if( config_GetInt( p_libvlc, "list" ) > 0 ) + else if( var_InheritBool( p_libvlc, "list" ) ) { ListModules( p_libvlc, false ); b_exit = true; i_ret = VLC_EEXITSUCCESS; } - else if( config_GetInt( p_libvlc, "list-verbose" ) > 0 ) + else if( var_InheritBool( p_libvlc, "list-verbose" ) ) { ListModules( p_libvlc, true ); b_exit = true; @@ -514,18 +502,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } /* Check for config file options */ - if( !config_GetInt( p_libvlc, "ignore-config" ) ) + if( !var_InheritBool( p_libvlc, "ignore-config" ) ) { - if( config_GetInt( p_libvlc, "reset-config" ) > 0 ) + if( var_InheritBool( p_libvlc, "reset-config" ) ) { config_ResetAll( p_libvlc ); - config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); - config_SaveConfigFile( p_libvlc, NULL ); - } - if( config_GetInt( p_libvlc, "save-config" ) > 0 ) - { - config_LoadConfigFile( p_libvlc, NULL ); - config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); config_SaveConfigFile( p_libvlc, NULL ); } } @@ -547,12 +528,15 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Override default configuration with config file settings */ - if( !config_GetInt( p_libvlc, "ignore-config" ) ) + if( !var_InheritBool( p_libvlc, "ignore-config" ) ) config_LoadConfigFile( p_libvlc, NULL ); /* * Override configuration with command line settings */ + /* config_LoadCmdLine(), DBus (below) and Win32-specific use vlc_optind, + * vlc_optarg and vlc_optopt globals. This is not thread-safe!! */ +#warning BUG! if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, false ) ) { #ifdef WIN32 @@ -565,20 +549,15 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, module_EndBank( p_libvlc, true ); return VLC_EGENERIC; } - priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); - - /* - * System specific configuration - */ - system_Configure( p_libvlc, &i_argc, ppsz_argv ); + priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" ); /* FIXME: could be replaced by using Unix sockets */ #ifdef HAVE_DBUS dbus_threads_init_default(); - if( config_GetInt( p_libvlc, "one-instance" ) > 0 - || ( config_GetInt( p_libvlc, "one-instance-when-started-from-file" ) - && config_GetInt( p_libvlc, "started-from-file" ) ) ) + if( var_InheritBool( p_libvlc, "one-instance" ) + || ( var_InheritBool( p_libvlc, "one-instance-when-started-from-file" ) + && var_InheritBool( p_libvlc, "started-from-file" ) ) ) { /* Initialise D-Bus interface, check for other instances */ DBusConnection *p_conn = NULL; @@ -625,7 +604,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, dbus_message_unref( p_test_reply ); msg_Warn( p_libvlc, "Another Media Player is running. Exiting"); - for( i_input = optind;i_input < i_argc;i_input++ ) + for( i_input = vlc_optind; i_input < i_argc;i_input++ ) { msg_Dbg( p_libvlc, "Adds %s to the running Media Player", ppsz_argv[i_input] ); @@ -651,7 +630,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, exit( 1 ); } b_play = TRUE; - if( config_GetInt( p_libvlc, "playlist-enqueue" ) > 0 ) + if( var_InheritBool( p_libvlc, "playlist-enqueue" ) ) b_play = FALSE; if ( !dbus_message_iter_append_basic( &dbus_args, DBUS_TYPE_BOOLEAN, &b_play ) ) @@ -725,7 +704,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* Last chance to set the verbosity. Once we start interfaces and other * threads, verbosity becomes read-only. */ var_Create( p_libvlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - if( config_GetInt( p_libvlc, "quiet" ) > 0 ) + if( var_InheritBool( p_libvlc, "quiet" ) ) { var_SetInteger( p_libvlc, "verbose", -1 ); priv->i_verbose = -1; @@ -733,7 +712,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, vlc_threads_setup( p_libvlc ); if( priv->b_color ) - priv->b_color = config_GetInt( p_libvlc, "color" ) > 0; + priv->b_color = var_InheritBool( p_libvlc, "color" ); char p_capabilities[200]; #define PRINT_CAPABILITY( capability, string ) \ @@ -746,23 +725,23 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, p_capabilities[0] = '\0'; #if defined( __i386__ ) || defined( __x86_64__ ) - if( !config_GetInt( p_libvlc, "mmx" ) ) + if( !var_InheritBool( p_libvlc, "mmx" ) ) cpu_flags &= ~CPU_CAPABILITY_MMX; - if( !config_GetInt( p_libvlc, "3dn" ) ) + if( !var_InheritBool( p_libvlc, "3dn" ) ) cpu_flags &= ~CPU_CAPABILITY_3DNOW; - if( !config_GetInt( p_libvlc, "mmxext" ) ) + if( !var_InheritBool( p_libvlc, "mmxext" ) ) cpu_flags &= ~CPU_CAPABILITY_MMXEXT; - if( !config_GetInt( p_libvlc, "sse" ) ) + if( !var_InheritBool( p_libvlc, "sse" ) ) cpu_flags &= ~CPU_CAPABILITY_SSE; - if( !config_GetInt( p_libvlc, "sse2" ) ) + if( !var_InheritBool( p_libvlc, "sse2" ) ) cpu_flags &= ~CPU_CAPABILITY_SSE2; - if( !config_GetInt( p_libvlc, "sse3" ) ) + if( !var_InheritBool( p_libvlc, "sse3" ) ) cpu_flags &= ~CPU_CAPABILITY_SSE3; - if( !config_GetInt( p_libvlc, "ssse3" ) ) + if( !var_InheritBool( p_libvlc, "ssse3" ) ) cpu_flags &= ~CPU_CAPABILITY_SSSE3; - if( !config_GetInt( p_libvlc, "sse41" ) ) + if( !var_InheritBool( p_libvlc, "sse41" ) ) cpu_flags &= ~CPU_CAPABILITY_SSE4_1; - if( !config_GetInt( p_libvlc, "sse42" ) ) + if( !var_InheritBool( p_libvlc, "sse42" ) ) cpu_flags &= ~CPU_CAPABILITY_SSE4_2; PRINT_CAPABILITY( CPU_CAPABILITY_MMX, "MMX" ); @@ -771,13 +750,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, PRINT_CAPABILITY( CPU_CAPABILITY_SSE, "SSE" ); PRINT_CAPABILITY( CPU_CAPABILITY_SSE2, "SSE2" ); PRINT_CAPABILITY( CPU_CAPABILITY_SSE3, "SSE3" ); - PRINT_CAPABILITY( CPU_CAPABILITY_SSE3, "SSSE3" ); + PRINT_CAPABILITY( CPU_CAPABILITY_SSSE3, "SSSE3" ); PRINT_CAPABILITY( CPU_CAPABILITY_SSE4_1, "SSE4.1" ); PRINT_CAPABILITY( CPU_CAPABILITY_SSE4_2, "SSE4.2" ); PRINT_CAPABILITY( CPU_CAPABILITY_SSE4A, "SSE4A" ); #elif defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ ) - if( !config_GetInt( p_libvlc, "altivec" ) ) + if( !var_InheritBool( p_libvlc, "altivec" ) ) cpu_flags &= ~CPU_CAPABILITY_ALTIVEC; PRINT_CAPABILITY( CPU_CAPABILITY_ALTIVEC, "AltiVec" ); @@ -793,7 +772,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, p_capabilities[sizeof(p_capabilities) - 1] = '\0'; #endif - msg_Dbg( p_libvlc, "CPU has capabilities %s", p_capabilities ); + if (p_capabilities[0]) + msg_Dbg( p_libvlc, "CPU has capabilities %s", p_capabilities ); /* * Choose the best memcpy module @@ -802,7 +782,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* Avoid being called "memcpy":*/ vlc_object_set_name( p_libvlc, "main" ); - priv->b_stats = config_GetInt( p_libvlc, "stats" ) > 0; + priv->b_stats = var_InheritBool( p_libvlc, "stats" ); priv->i_timers = 0; priv->pp_timers = NULL; @@ -811,27 +791,14 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Initialize hotkey handling */ - var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER ); - var_Create( p_libvlc, "key-action", VLC_VAR_INTEGER ); - { - struct hotkey *p_keys = - malloc( (libvlc_actions_count + 1) * sizeof (*p_keys) ); + vlc_InitActions( p_libvlc ); - /* Initialize from configuration */ - for( size_t i = 0; i < libvlc_actions_count; i++ ) - { - p_keys[i].psz_action = libvlc_actions[i].name; - p_keys[i].i_key = config_GetInt( p_libvlc, - libvlc_actions[i].name ); - p_keys[i].i_action = libvlc_actions[i].value; - } - p_keys[libvlc_actions_count].psz_action = NULL; - p_keys[libvlc_actions_count].i_key = 0; - p_keys[libvlc_actions_count].i_action = 0; - p_libvlc->p_hotkeys = p_keys; - var_AddCallback( p_libvlc, "key-pressed", vlc_key_to_action, - p_keys ); - } + /* Create a variable for showing the fullscreen interface */ + var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL ); + var_SetBool( p_libvlc, "intf-show", true ); + + /* Create a variable for showing the right click menu */ + var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL ); /* variables for signalling creation of new files */ var_Create( p_libvlc, "snapshot-file", VLC_VAR_STRING ); @@ -849,18 +816,19 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, module_EndBank( p_libvlc, true ); return VLC_EGENERIC; } - playlist_Activate( p_playlist ); - vlc_object_attach( p_playlist, p_libvlc ); + + /* System specific configuration */ + system_Configure( p_libvlc, &i_argc, ppsz_argv ); /* Add service discovery modules */ - psz_modules = var_CreateGetNonEmptyString( p_playlist, "services-discovery" ); + psz_modules = var_InheritString( p_libvlc, "services-discovery" ); if( psz_modules ) { char *p = psz_modules, *m; while( ( m = strsep( &p, " :," ) ) != NULL ) playlist_ServicesDiscoveryAdd( p_playlist, m ); + free( psz_modules ); } - free( psz_modules ); #ifdef ENABLE_VLM /* Initialize VLM if vlm-conf is specified */ @@ -877,10 +845,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Load background interfaces */ - /* Create volume callback system. (this variable must be created before - all interfaces as they can use it) */ - var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL ); - psz_modules = var_CreateGetNonEmptyString( p_libvlc, "extraintf" ); psz_control = var_CreateGetNonEmptyString( p_libvlc, "control" ); @@ -927,26 +891,26 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #ifdef HAVE_DBUS /* loads dbus control interface if in one-instance mode * we do it only when playlist exists, because dbus module needs it */ - if( config_GetInt( p_libvlc, "one-instance" ) > 0 - || ( config_GetInt( p_libvlc, "one-instance-when-started-from-file" ) - && config_GetInt( p_libvlc, "started-from-file" ) ) ) + if( var_InheritBool( p_libvlc, "one-instance" ) + || ( var_InheritBool( p_libvlc, "one-instance-when-started-from-file" ) + && var_InheritBool( p_libvlc, "started-from-file" ) ) ) intf_Create( p_libvlc, "dbus,none" ); # if !defined (HAVE_MAEMO) /* Prevents the power management daemon from suspending the system * when VLC is active */ - if( config_GetInt( p_libvlc, "inhibit" ) > 0 ) + if( var_InheritBool( p_libvlc, "inhibit" ) > 0 ) intf_Create( p_libvlc, "inhibit,none" ); # endif #endif - if( (config_GetInt( p_libvlc, "file-logging" ) > 0) && - !config_GetInt( p_libvlc, "syslog" ) ) + if( var_InheritBool( p_libvlc, "file-logging" ) && + !var_InheritBool( p_libvlc, "syslog" ) ) { intf_Create( p_libvlc, "logger,none" ); } #ifdef HAVE_SYSLOG_H - if( config_GetInt( p_libvlc, "syslog" ) > 0 ) + if( var_InheritBool( p_libvlc, "syslog" ) ) { char *logmode = var_CreateGetNonEmptyString( p_libvlc, "logmode" ); var_SetString( p_libvlc, "logmode", "syslog" ); @@ -961,15 +925,15 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } #endif - if( config_GetInt( p_libvlc, "network-synchronisation") > 0 ) + if( var_InheritBool( p_libvlc, "network-synchronisation") ) { intf_Create( p_libvlc, "netsync,none" ); } #ifdef WIN32 - if( config_GetInt( p_libvlc, "prefer-system-codecs") > 0 ) + if( var_InheritBool( p_libvlc, "prefer-system-codecs") ) { - char *psz_codecs = var_CreateGetNonEmptyString( p_playlist, "codec" ); + char *psz_codecs = var_CreateGetNonEmptyString( p_libvlc, "codec" ); if( psz_codecs ) { char *psz_morecodecs; @@ -993,14 +957,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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 a variable for showing the fullscreen interface from hotkeys */ - var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL ); - var_SetBool( p_libvlc, "intf-show", true ); - - /* Create a variable for showing the right click menu */ - var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL ); +#ifdef WIN32 + var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_ADDRESS ); +#endif /* * Get input filenames given as commandline arguments @@ -1010,15 +969,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Get --open argument */ - psz_val = var_CreateGetNonEmptyString( p_libvlc, "open" ); + psz_val = var_InheritString( p_libvlc, "open" ); if ( psz_val != NULL ) { - playlist_t *p_playlist = pl_Hold( p_libvlc ); playlist_AddExt( p_playlist, psz_val, NULL, PLAYLIST_INSERT, 0, -1, 0, NULL, 0, true, pl_Unlocked ); - pl_Release( p_libvlc ); + free( psz_val ); } - free( psz_val ); return VLC_SUCCESS; } @@ -1030,11 +987,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) { libvlc_priv_t *priv = libvlc_priv (p_libvlc); - playlist_t *p_playlist = priv->p_playlist; + playlist_t *p_playlist = libvlc_priv (p_libvlc)->p_playlist; /* Deactivate the playlist */ msg_Dbg( p_libvlc, "deactivating the playlist" ); - playlist_Deactivate( p_playlist ); + pl_Deactivate( p_libvlc ); /* Remove all services discovery */ msg_Dbg( p_libvlc, "removing all services discovery tasks" ); @@ -1053,14 +1010,8 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) } #endif - /* Free playlist */ - /* Any thread still running must not assume pl_Hold() succeeds. */ - msg_Dbg( p_libvlc, "removing playlist" ); - - libvlc_priv(p_libvlc)->p_playlist = NULL; - barrier(); /* FIXME is that correct ? */ - - vlc_object_release( p_playlist ); + /* Free playlist now, all threads are gone */ + playlist_Destroy( p_playlist ); stats_TimersDumpAll( p_libvlc ); stats_TimersCleanAll( p_libvlc ); @@ -1095,9 +1046,7 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) /* Free module bank. It is refcounted, so we call this each time */ module_EndBank( p_libvlc, true ); - var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action, - (void *)p_libvlc->p_hotkeys ); - free( (void *)p_libvlc->p_hotkeys ); + vlc_DeinitActions( p_libvlc ); } /** @@ -1121,10 +1070,9 @@ void libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) } vlc_mutex_unlock( &global_lock ); - msg_Destroy( p_libvlc ); + msg_Destroy (priv->msg_bank); /* Destroy mutexes */ - vlc_cond_destroy( &priv->exiting ); vlc_mutex_destroy( &priv->timer_lock ); #ifndef NDEBUG /* Hack to dump leaked objects tree */ @@ -1162,6 +1110,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) "Use 'cvlc' to use vlc without interface.") ); } free( psz_interface ); + var_Destroy( p_libvlc, "intf" ); } /* Try to create the interface */ @@ -1169,11 +1118,18 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) if( ret ) msg_Err( p_libvlc, "interface \"%s\" initialization failed", psz_module ? psz_module : "default" ); - var_Destroy( p_libvlc, "intf" ); return ret; } +#ifndef WIN32 static vlc_mutex_t exit_lock = VLC_STATIC_MUTEX; +static vlc_cond_t exiting = VLC_STATIC_COND; +#else +extern vlc_mutex_t super_mutex; +extern vlc_cond_t super_variable; +# define exit_lock super_mutex +# define exiting super_variable +#endif /** * Waits until the LibVLC instance gets an exit signal. Normally, this happens @@ -1181,11 +1137,9 @@ static vlc_mutex_t exit_lock = VLC_STATIC_MUTEX; */ void libvlc_InternalWait( libvlc_int_t *p_libvlc ) { - libvlc_priv_t *priv = libvlc_priv( p_libvlc ); - vlc_mutex_lock( &exit_lock ); while( vlc_object_alive( p_libvlc ) ) - vlc_cond_wait( &priv->exiting, &exit_lock ); + vlc_cond_wait( &exiting, &exit_lock ); vlc_mutex_unlock( &exit_lock ); } @@ -1195,11 +1149,9 @@ void libvlc_InternalWait( libvlc_int_t *p_libvlc ) */ void libvlc_Quit( libvlc_int_t *p_libvlc ) { - libvlc_priv_t *priv = libvlc_priv( p_libvlc ); - vlc_mutex_lock( &exit_lock ); vlc_object_kill( p_libvlc ); - vlc_cond_signal( &priv->exiting ); + vlc_cond_broadcast( &exiting ); vlc_mutex_unlock( &exit_lock ); } @@ -1234,50 +1186,6 @@ static void SetLanguage ( const char *psz_lang ) } #endif - -static inline int LoadMessages (void) -{ -#if defined( ENABLE_NLS ) \ - && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) - /* Specify where to find the locales for current domain */ -#if !defined( __APPLE__ ) && !defined( WIN32 ) && !defined( SYS_BEOS ) - static const char psz_path[] = LOCALEDIR; -#else - char psz_path[1024]; - if (snprintf (psz_path, sizeof (psz_path), "%s" DIR_SEP "%s", - config_GetDataDirDefault(), "locale") - >= (int)sizeof (psz_path)) - return -1; - -#endif - if (bindtextdomain (PACKAGE_NAME, psz_path) == NULL) - { - fprintf (stderr, "Warning: cannot bind text domain "PACKAGE_NAME - " to directory %s\n", psz_path); - return -1; - } - - /* LibVLC wants all messages in UTF-8. - * Unfortunately, we cannot ask UTF-8 for strerror_r(), strsignal_r() - * and other functions that are not part of our text domain. - */ - if (bind_textdomain_codeset (PACKAGE_NAME, "UTF-8") == NULL) - { - fprintf (stderr, "Error: cannot set Unicode encoding for text domain " - PACKAGE_NAME"\n"); - // Unbinds the text domain to avoid broken encoding - bindtextdomain (PACKAGE_NAME, "DOES_NOT_EXIST"); - return -1; - } - - /* LibVLC does NOT set the default textdomain, since it is a library. - * This could otherwise break programs using LibVLC (other than VLC). - * textdomain (PACKAGE_NAME); - */ -#endif - return 0; -} - /***************************************************************************** * GetFilenames: parse command line options which are not flags ***************************************************************************** @@ -1290,12 +1198,12 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, const char *ppsz_argv[ /* We assume that the remaining parameters are filenames * and their input options */ - for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- ) + for( i_opt = i_argc - 1; i_opt >= vlc_optind; i_opt-- ) { i_options = 0; /* Count the input options */ - while( *ppsz_argv[ i_opt ] == ':' && i_opt > optind ) + while( *ppsz_argv[ i_opt ] == ':' && i_opt > vlc_optind ) { i_options++; i_opt--; @@ -1307,11 +1215,9 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, const char *ppsz_argv[ if( !mrl ) continue; - playlist_t *p_playlist = pl_Hold( p_vlc ); - playlist_AddExt( p_playlist, mrl, NULL, PLAYLIST_INSERT, + playlist_AddExt( pl_Get( p_vlc ), mrl, NULL, PLAYLIST_INSERT, 0, -1, i_options, ( i_options ? &ppsz_argv[i_opt + 1] : NULL ), VLC_INPUT_OPTION_TRUSTED, true, pl_Unlocked ); - pl_Release( p_vlc ); free( mrl ); } @@ -1409,21 +1315,26 @@ static void Help( libvlc_int_t *p_this, char const *psz_help_name ) # define CYAN COL(36) # define WHITE COL(0) # define GRAY "\033[0m" -static void print_help_section( module_config_t *p_item, bool b_color, bool b_description ) +static void +print_help_section( const module_t *m, const module_config_t *p_item, + bool b_color, bool b_description ) { if( !p_item ) return; if( b_color ) { - utf8_fprintf( stdout, RED" %s:\n"GRAY, _( p_item->psz_text ) ); - if( b_description && p_item->psz_longtext ) + utf8_fprintf( stdout, RED" %s:\n"GRAY, + module_gettext( m, p_item->psz_text ) ); + if( b_description && p_item->psz_longtext && *p_item->psz_longtext ) utf8_fprintf( stdout, MAGENTA" %s\n"GRAY, - _( p_item->psz_longtext ) ); + module_gettext( m, p_item->psz_longtext ) ); } else { - utf8_fprintf( stdout, " %s:\n", _( p_item->psz_text ) ); - if( b_description && p_item->psz_longtext ) - utf8_fprintf( stdout, " %s\n", _( p_item->psz_longtext ) ); + utf8_fprintf( stdout, " %s:\n", + module_gettext( m, p_item->psz_text ) ); + if( b_description && p_item->psz_longtext && *p_item->psz_longtext ) + utf8_fprintf( stdout, " %s\n", + module_gettext(m, p_item->psz_longtext ) ); } } @@ -1460,10 +1371,10 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) char psz_short[4]; int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1); int i_width_description = i_width + PADDING_SPACES - 1; - bool b_advanced = config_GetInt( p_this, "advanced" ) > 0; - bool b_description = config_GetInt( p_this, "help-verbose" ) > 0; + bool b_advanced = var_InheritBool( p_this, "advanced" ); + bool b_description = var_InheritBool( p_this, "help-verbose" ); bool b_description_hack; - bool b_color = config_GetInt( p_this, "color" ) > 0; + bool b_color = var_InheritBool( p_this, "color" ); bool b_has_advanced = false; bool b_found = false; int i_only_advanced = 0; /* Number of modules ignored because they @@ -1563,18 +1474,20 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) { if( b_color ) utf8_fprintf( stdout, "\n " GREEN "%s" GRAY " (%s)\n", - _( p_parser->psz_longname ), + module_gettext( p_parser, p_parser->psz_longname ), p_parser->psz_object_name ); else - utf8_fprintf( stdout, "\n %s\n", _( p_parser->psz_longname ) ); + utf8_fprintf( stdout, "\n %s\n", + module_gettext(p_parser, p_parser->psz_longname ) ); } if( p_parser->psz_help ) { if( b_color ) utf8_fprintf( stdout, CYAN" %s\n"GRAY, - _( p_parser->psz_help ) ); + module_gettext( p_parser, p_parser->psz_help ) ); else - utf8_fprintf( stdout, " %s\n", _( p_parser->psz_help ) ); + utf8_fprintf( stdout, " %s\n", + module_gettext( p_parser, p_parser->psz_help ) ); } /* Print module options */ @@ -1608,19 +1521,20 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) { if( b_color ) utf8_fprintf( stdout, GREEN "\n %s\n" GRAY, - _( p_item->psz_text ) ); + module_gettext( p_parser, p_item->psz_text ) ); else utf8_fprintf( stdout, "\n %s\n", - _( p_item->psz_text ) ); + module_gettext( p_parser, p_item->psz_text ) ); } - if( b_description && p_item->psz_longtext ) + if( b_description && p_item->psz_longtext + && *p_item->psz_longtext ) { if( b_color ) utf8_fprintf( stdout, CYAN " %s\n" GRAY, - _( p_item->psz_longtext ) ); + module_gettext( p_parser, p_item->psz_longtext ) ); else utf8_fprintf( stdout, " %s\n", - _( p_item->psz_longtext ) ); + module_gettext( p_parser, p_item->psz_longtext ) ); } break; @@ -1640,7 +1554,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) case CONFIG_ITEM_MODULE_LIST_CAT: case CONFIG_ITEM_FONT: case CONFIG_ITEM_PASSWORD: - print_help_section( p_section, b_color, b_description ); + print_help_section( p_parser, p_section, b_color, + b_description ); p_section = NULL; psz_bra = OPTION_VALUE_SEP "<"; psz_type = _("string"); @@ -1661,7 +1576,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) break; case CONFIG_ITEM_INTEGER: case CONFIG_ITEM_KEY: /* FIXME: do something a bit more clever */ - print_help_section( p_section, b_color, b_description ); + print_help_section( p_parser, p_section, b_color, + b_description ); p_section = NULL; psz_bra = OPTION_VALUE_SEP "<"; psz_type = _("integer"); @@ -1684,13 +1600,14 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) if( i ) strcat( psz_buffer, ", " ); sprintf( psz_buffer + strlen(psz_buffer), "%i (%s)", p_item->pi_list[i], - _( p_item->ppsz_list_text[i] ) ); + module_gettext( p_parser, p_item->ppsz_list_text[i] ) ); } psz_ket = "}"; } break; case CONFIG_ITEM_FLOAT: - print_help_section( p_section, b_color, b_description ); + print_help_section( p_parser, p_section, b_color, + b_description ); p_section = NULL; psz_bra = OPTION_VALUE_SEP "<"; psz_type = _("float"); @@ -1703,7 +1620,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) } break; case CONFIG_ITEM_BOOL: - print_help_section( p_section, b_color, b_description ); + print_help_section( p_parser, p_section, b_color, + b_description ); p_section = NULL; psz_bra = ""; psz_type = ""; psz_ket = ""; if( !b_help_module ) @@ -1764,7 +1682,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) psz_spaces[i] = ' '; /* We wrap the rest of the output */ - sprintf( psz_buffer, "%s%s", _( p_item->psz_text ), + sprintf( psz_buffer, "%s%s", module_gettext( p_parser, p_item->psz_text ), psz_suf ); b_description_hack = b_description; @@ -1855,9 +1773,11 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) } } - if( b_description_hack && p_item->psz_longtext ) + if( b_description_hack && p_item->psz_longtext + && *p_item->psz_longtext ) { - sprintf( psz_buffer, "%s%s", _( p_item->psz_longtext ), + sprintf( psz_buffer, "%s%s", + module_gettext( p_parser, p_item->psz_longtext ), psz_suf ); b_description_hack = false; psz_spaces = psz_spaces_longtext; @@ -1916,7 +1836,7 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) { module_t *p_parser; - bool b_color = config_GetInt( p_this, "color" ) > 0; + bool b_color = var_InheritBool( p_this, "color" ); #ifdef WIN32 ShowConsole( true ); @@ -1935,11 +1855,11 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) if( b_color ) utf8_fprintf( stdout, GREEN" %-22s "WHITE"%s\n"GRAY, p_parser->psz_object_name, - _( p_parser->psz_longname ) ); + module_gettext( p_parser, p_parser->psz_longname ) ); else utf8_fprintf( stdout, " %-22s %s\n", p_parser->psz_object_name, - _( p_parser->psz_longname ) ); + module_gettext( p_parser, p_parser->psz_longname ) ); if( b_verbose ) { @@ -1984,15 +1904,14 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) *****************************************************************************/ static void Version( void ) { - extern const char psz_vlc_changeset[]; #ifdef WIN32 ShowConsole( true ); #endif utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VLC_Version(), psz_vlc_changeset ); - utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"), - VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() ); + utf8_fprintf( stdout, _("Compiled by %s on %s (%s)\n"), + VLC_CompileBy(), VLC_CompileHost(), __DATE__" "__TIME__ ); utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); utf8_fprintf( stdout, "%s", LICENSE_MSG );