X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-common.c;h=2e648d4ace09c64a0408a4d3ca6d4c1c6d350de3;hb=9df284851e95e95a365d058ae26456e6168c84bb;hp=d2c06d52cb2e0d70fb31e29292c5a14476fe6f43;hpb=959c5560883360dff21958fbf79abce04baec84c;p=vlc diff --git a/src/libvlc-common.c b/src/libvlc-common.c index d2c06d52cb..2e648d4ace 100644 --- a/src/libvlc-common.c +++ b/src/libvlc-common.c @@ -93,14 +93,16 @@ #include "playlist/playlist_internal.h" +#include + /***************************************************************************** - * The evil global variable. We handle it with care, don't worry. + * The evil global variables. We handle them with care, don't worry. *****************************************************************************/ -static libvlc_global_data_t libvlc_global; -static libvlc_global_data_t *p_libvlc_global = &libvlc_global; static libvlc_int_t * p_static_vlc = NULL; static volatile unsigned int i_instances = 0; +static bool b_daemon = false; + /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -112,11 +114,11 @@ 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_module_name ); -static void ListModules ( libvlc_int_t *, vlc_bool_t ); +static void ListModules ( libvlc_int_t *, bool ); static void Version ( void ); #ifdef WIN32 -static void ShowConsole ( vlc_bool_t ); +static void ShowConsole ( bool ); static void PauseConsole ( void ); #endif static int ConsoleWidth ( void ); @@ -126,11 +128,6 @@ static int VerboseCallback( vlc_object_t *, char const *, static void InitDeviceValues( libvlc_int_t * ); -libvlc_global_data_t *vlc_global( void ) -{ - return p_libvlc_global; -} - /***************************************************************************** * vlc_current_object: return the current object. ***************************************************************************** @@ -149,42 +146,43 @@ libvlc_int_t * vlc_current_object( int i_object ) */ libvlc_int_t * libvlc_InternalCreate( void ) { - int i_ret; - libvlc_int_t * p_libvlc = NULL; + libvlc_int_t *p_libvlc; + libvlc_priv_t *priv; char *psz_env = NULL; /* 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; + if (vlc_threads_init ()) + return NULL; + libvlc_global_data_t *p_libvlc_global = vlc_global(); /* Now that the thread system is initialized, we don't have much, but * at least we have variables */ vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); - - i_instances++; - - if( !p_libvlc_global->b_ready ) + if( i_instances == 0 ) { /* Guess what CPU we have */ cpu_flags = CPUCapabilities(); /* The module bank will be initialized later */ p_libvlc_global->p_module_bank = NULL; - - p_libvlc_global->b_ready = VLC_TRUE; } - vlc_mutex_unlock( lock ); /* Allocate a libvlc instance object */ - p_libvlc = vlc_object_create( p_libvlc_global, VLC_OBJECT_LIBVLC ); + p_libvlc = vlc_custom_create( VLC_OBJECT(p_libvlc_global), + sizeof (*p_libvlc) + sizeof (libvlc_priv_t), + VLC_OBJECT_LIBVLC, "libvlc" ); + if( p_libvlc != NULL ) + i_instances++; + vlc_mutex_unlock( lock ); + if( p_libvlc == NULL ) - { - i_instances--; return NULL; - } + p_libvlc->p_playlist = NULL; p_libvlc->p_interaction = NULL; - p_libvlc->psz_object_name = "libvlc"; + p_libvlc->p_vlm = NULL; + p_libvlc->psz_object_name = strdup( "libvlc" ); + priv = libvlc_priv (p_libvlc); /* Initialize message queue */ msg_Create( p_libvlc ); @@ -198,7 +196,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) #if defined( HAVE_ISATTY ) && !defined( WIN32 ) p_libvlc->b_color = isatty( 2 ); /* 2 is for stderr */ #else - p_libvlc->b_color = VLC_FALSE; + p_libvlc->b_color = false; #endif /* Announce who we are - Do it only for first instance ? */ @@ -206,10 +204,9 @@ libvlc_int_t * libvlc_InternalCreate( void ) msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE ); /* Initialize mutexes */ - vlc_mutex_init( p_libvlc, &p_libvlc->timer_lock ); - vlc_mutex_init( p_libvlc, &p_libvlc->config_lock ); + vlc_mutex_init( &priv->timer_lock ); + vlc_mutex_init( &priv->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 data for the non-reentrant API */ @@ -229,12 +226,14 @@ libvlc_int_t * libvlc_InternalCreate( void ) int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, const char *ppsz_argv[] ) { + libvlc_global_data_t *p_libvlc_global = vlc_global(); + libvlc_priv_t *priv = libvlc_priv (p_libvlc); char p_capabilities[200]; char * p_tmp = NULL; char * psz_modules = NULL; char * psz_parser = NULL; char * psz_control = NULL; - vlc_bool_t b_exit = VLC_FALSE; + bool b_exit = false; int i_ret = VLC_EEXIT; playlist_t *p_playlist = NULL; vlc_value_t val; @@ -251,16 +250,18 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* Get the executable name (similar to the basename command) */ if( i_argc > 0 ) { - const char *exe = p_libvlc->psz_object_name = ppsz_argv[0]; + const char *exe = strdup( ppsz_argv[0] ); + const char *tmp = exe; while( *exe ) { if( *exe++ == '/' ) - p_libvlc->psz_object_name = exe; + tmp = exe; } + p_libvlc->psz_object_name = strdup( tmp ); } else { - p_libvlc->psz_object_name = "vlc"; + p_libvlc->psz_object_name = strdup( "vlc" ); } /* @@ -277,7 +278,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, * options) */ module_InitBank( p_libvlc ); - if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ) ) + if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ) ) { module_EndBank( p_libvlc ); return VLC_EGENERIC; @@ -287,14 +288,14 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( config_GetInt( p_libvlc, "help" ) > 0 ) { Help( p_libvlc, "help" ); - b_exit = VLC_TRUE; + b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Check for version option */ else if( config_GetInt( p_libvlc, "version" ) > 0 ) { Version(); - b_exit = VLC_TRUE; + b_exit = true; i_ret = VLC_EEXITSUCCESS; } @@ -308,7 +309,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* Check for plugins cache options */ if( config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0 ) { - p_libvlc_global->p_module_bank->b_cache_delete = VLC_TRUE; + p_libvlc_global->p_module_bank->b_cache_delete = true; } /* Will be re-done properly later on */ @@ -324,9 +325,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( daemon( 1, 0) != 0 ) { msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" ); - b_exit = VLC_TRUE; + b_exit = true; } - p_libvlc_global->b_daemon = VLC_TRUE; + b_daemon = true; /* lets check if we need to write the pidfile */ psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); @@ -356,13 +357,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( ( i_pid = fork() ) < 0 ) { msg_Err( p_libvlc, "unable to fork vlc to daemon mode" ); - b_exit = VLC_TRUE; + b_exit = true; } else if( i_pid ) { /* This is the parent, exit right now */ msg_Dbg( p_libvlc, "closing parent process" ); - b_exit = VLC_TRUE; + b_exit = true; i_ret = VLC_EEXITSUCCESS; } else @@ -373,7 +374,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, close( STDOUT_FILENO ); close( STDERR_FILENO ); - p_libvlc_global->b_daemon = VLC_TRUE; + b_daemon = true; } #endif } @@ -391,14 +392,16 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, # 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 ); + + if( !config_GetInt( p_libvlc, "ignore-config" ) ) + config_LoadConfigFile( p_libvlc, "main" ); + config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, 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 = p_libvlc_global->p_module_bank->b_cache_delete; + bool b_cache_delete = p_libvlc_global->p_module_bank->b_cache_delete; /* Reset the default domain */ SetLanguage( psz_language ); @@ -408,8 +411,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, module_EndBank( p_libvlc ); module_InitBank( p_libvlc ); - config_LoadConfigFile( p_libvlc, "main" ); - config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ); + if( !config_GetInt( p_libvlc, "ignore-config" ) ) + config_LoadConfigFile( p_libvlc, "main" ); + config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); p_libvlc_global->p_module_bank->b_cache_delete = b_cache_delete; } free( psz_language ); @@ -426,7 +430,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, module_LoadPlugins( p_libvlc ); if( p_libvlc->b_die ) { - b_exit = VLC_TRUE; + b_exit = true; } msg_Dbg( p_libvlc, "module bank initialized, found %i modules", @@ -437,42 +441,45 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, { Help( p_libvlc, p_tmp ); free( p_tmp ); - b_exit = VLC_TRUE; + b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Check for long help option */ else if( config_GetInt( p_libvlc, "longhelp" ) > 0 ) { Help( p_libvlc, "longhelp" ); - b_exit = VLC_TRUE; + b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Check for module list option */ else if( config_GetInt( p_libvlc, "list" ) > 0 ) { - ListModules( p_libvlc, VLC_FALSE ); - b_exit = VLC_TRUE; + ListModules( p_libvlc, false ); + b_exit = true; i_ret = VLC_EEXITSUCCESS; } else if( config_GetInt( p_libvlc, "list-verbose" ) > 0 ) { - ListModules( p_libvlc, VLC_TRUE ); - b_exit = VLC_TRUE; + ListModules( p_libvlc, true ); + b_exit = true; i_ret = VLC_EEXITSUCCESS; } /* Check for config file options */ - if( config_GetInt( p_libvlc, "reset-config" ) > 0 ) + if( !config_GetInt( p_libvlc, "ignore-config" ) ) { - config_ResetAll( p_libvlc ); - config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_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, VLC_TRUE ); - config_SaveConfigFile( p_libvlc, NULL ); + if( config_GetInt( p_libvlc, "reset-config" ) > 0 ) + { + 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 ); + } } if( b_exit ) @@ -489,15 +496,16 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Override default configuration with config file settings */ - config_LoadConfigFile( p_libvlc, NULL ); + if( !config_GetInt( p_libvlc, "ignore-config" ) ) + config_LoadConfigFile( p_libvlc, NULL ); /* * Override configuration with command line settings */ - if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_FALSE ) ) + if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, false ) ) { #ifdef WIN32 - ShowConsole( VLC_FALSE ); + ShowConsole( 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" ); @@ -702,19 +710,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, */ 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" ) > 0; - p_libvlc->i_timers = 0; - p_libvlc->pp_timers = NULL; + priv->b_stats = config_GetInt( p_libvlc, "stats" ) > 0; + priv->i_timers = 0; + priv->pp_timers = NULL; /* Init stats */ p_libvlc->p_stats = (global_stats_t *)malloc( sizeof( global_stats_t ) ); @@ -723,7 +721,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, vlc_object_release( p_libvlc ); return VLC_ENOMEM; } - vlc_mutex_init( p_libvlc, &p_libvlc->p_stats->lock ); + vlc_mutex_init( &p_libvlc->p_stats->lock ); p_libvlc->p_stats_computer = NULL; /* Init the array that holds every input item */ @@ -766,6 +764,18 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } free( psz_modules ); +#ifdef ENABLE_SOUT + /* Initialize VLM if vlm-conf is specified */ + psz_parser = config_GetPsz( p_libvlc, "vlm-conf" ); + if( psz_parser && *psz_parser ) + { + p_libvlc->p_vlm = vlm_New( p_libvlc ); + if( !p_libvlc->p_vlm ) + msg_Err( p_libvlc, "VLM initialization failed" ); + } + free( psz_parser ); +#endif + /* * Load background interfaces */ @@ -799,7 +809,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( psz_temp ) { sprintf( psz_temp, "%s,none", psz_module ); - VLC_AddIntf( 0, psz_temp, VLC_FALSE, VLC_FALSE ); + VLC_AddIntf( 0, psz_temp, false, false ); free( psz_temp ); } } @@ -809,18 +819,18 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Always load the hotkeys interface if it exists */ - VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE, VLC_FALSE ); + VLC_AddIntf( 0, "hotkeys,none", false, false ); #ifdef HAVE_DBUS_3 /* 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 ) - VLC_AddIntf( 0, "dbus,none", VLC_FALSE, VLC_FALSE ); + VLC_AddIntf( 0, "dbus,none", false, false ); - /* Prevents the power management daemon to suspend the computer + /* Prevents the power management daemon from suspending the system * when VLC is active */ if( config_GetInt( p_libvlc, "inhibit" ) > 0 ) - VLC_AddIntf( 0, "inhibit,none", VLC_FALSE, VLC_FALSE ); + VLC_AddIntf( 0, "inhibit,none", false, false ); #endif /* @@ -830,31 +840,31 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #ifdef HAVE_X11_XLIB_H if( config_GetInt( p_libvlc, "disable-screensaver" ) ) { - VLC_AddIntf( 0, "screensaver,none", VLC_FALSE, VLC_FALSE ); + VLC_AddIntf( 0, "screensaver,none", false, false ); } #endif if( config_GetInt( p_libvlc, "file-logging" ) > 0 ) { - VLC_AddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE ); + VLC_AddIntf( 0, "logger,none", false, false ); } #ifdef HAVE_SYSLOG_H if( config_GetInt( p_libvlc, "syslog" ) > 0 ) { const char *psz_logmode = "logmode=syslog"; - libvlc_InternalAddIntf( p_libvlc, "logger,none", VLC_FALSE, VLC_FALSE, + libvlc_InternalAddIntf( p_libvlc, "logger,none", false, false, 1, &psz_logmode ); } #endif if( config_GetInt( p_libvlc, "show-intf" ) > 0 ) { - VLC_AddIntf( 0, "showintf,none", VLC_FALSE, VLC_FALSE ); + VLC_AddIntf( 0, "showintf,none", false, false ); } if( config_GetInt( p_libvlc, "network-synchronisation") > 0 ) { - VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE ); + VLC_AddIntf( 0, "netsync,none", false, false ); } #ifdef WIN32 @@ -922,7 +932,6 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) intf_thread_t * p_intf = NULL; vout_thread_t * p_vout = NULL; aout_instance_t * p_aout = NULL; - announce_handler_t * p_announce = NULL; /* Ask the interfaces to stop and destroy them */ msg_Dbg( p_libvlc, "removing all interfaces" ); @@ -957,12 +966,34 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) aout_Delete( p_aout ); } +#ifdef ENABLE_SOUT + sout_instance_t * p_sout; + + p_sout = vlc_object_find( p_libvlc, VLC_OBJECT_SOUT, FIND_CHILD ); + if( p_sout ) + { + msg_Dbg( p_sout, "removing kept stream output" ); + vlc_object_detach( (vlc_object_t*)p_sout ); + vlc_object_release( (vlc_object_t*)p_sout ); + sout_DeleteInstance( p_sout ); + } + + /* Destroy VLM if created in libvlc_InternalInit */ + if( p_libvlc->p_vlm ) + { + vlm_Delete( p_libvlc->p_vlm ); + } +#endif + /* Free interaction */ msg_Dbg( p_libvlc, "removing interaction" ); vlc_object_release( p_libvlc->p_interaction ); stats_TimersDumpAll( p_libvlc ); - stats_TimersClean( p_libvlc ); + stats_TimersCleanAll( p_libvlc ); + +#ifdef ENABLE_SOUT + announce_handler_t * p_announce; /* Free announce handler(s?) */ while( (p_announce = vlc_object_find( p_libvlc, VLC_OBJECT_ANNOUNCE, @@ -973,13 +1004,15 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) vlc_object_release( p_announce ); announce_HandlerDestroy( p_announce ); } +#endif - msg_Dbg( p_libvlc, "removing remaining input items" ); + bool b_clean = true; FOREACH_ARRAY( input_item_t *p_del, p_libvlc->input_items ) - msg_Dbg( p_libvlc, "WARNING: %p input item has not been deleted properly", p_del ); - input_ItemClean( p_del ); - free( p_del ); + msg_Err( p_libvlc, "input item %p has not been deleted properly: refcount %d, name %s", + p_del, p_del->i_gc_refcount, p_del->psz_name ? p_del->psz_name : "(null)" ); + b_clean = false; FOREACH_END(); + assert( b_clean ); ARRAY_RESET( p_libvlc->input_items ); msg_Dbg( p_libvlc, "removing stats" ); @@ -997,13 +1030,13 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) * \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 ) +int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, bool b_release ) { - vlc_value_t lockval; - if( !p_libvlc ) return VLC_EGENERIC; + libvlc_priv_t *priv = libvlc_priv (p_libvlc); + #ifndef WIN32 char* psz_pidfile = NULL; @@ -1055,8 +1088,8 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) msg_Destroy( p_libvlc ); /* Destroy mutexes */ - vlc_mutex_destroy( &p_libvlc->config_lock ); - vlc_mutex_destroy( &p_libvlc->timer_lock ); + vlc_mutex_destroy( &priv->config_lock ); + vlc_mutex_destroy( &priv->timer_lock ); if( b_release ) vlc_object_release( p_libvlc ); vlc_object_release( p_libvlc ); @@ -1065,7 +1098,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) /* Stop thread system: last one out please shut the door! * The number of initializations of the thread system is counted, we * can call this each time */ - vlc_threads_end( p_libvlc_global ); + vlc_threads_end (); return VLC_SUCCESS; } @@ -1075,7 +1108,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) */ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module, - vlc_bool_t b_block, vlc_bool_t b_play, + bool b_block, bool b_play, int i_options, const char *const *ppsz_options ) { int i_err; @@ -1093,7 +1126,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, } #ifndef WIN32 - if( p_libvlc_global->b_daemon && b_block && !psz_module ) + if( b_daemon && b_block && !psz_module ) { /* Daemon mode hack. * We prefer the dummy interface if none is specified. */ @@ -1185,7 +1218,7 @@ static inline int LoadMessages (void) #else char psz_path[1024]; if (snprintf (psz_path, sizeof (psz_path), "%s/%s", - p_libvlc_global->psz_vlcpath, "locale") + vlc_global()->psz_vlcpath, "locale") >= (int)sizeof (psz_path)) return -1; @@ -1261,7 +1294,7 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, const char *ppsz_argv[ static void Help( libvlc_int_t *p_this, char const *psz_help_name ) { #ifdef WIN32 - ShowConsole( VLC_TRUE ); + ShowConsole( true ); #endif if( psz_help_name && !strcmp( psz_help_name, "help" ) ) @@ -1334,18 +1367,18 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) int i_index; int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1); int i_width_description = i_width + PADDING_SPACES - 1; - vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" ) > 0; - vlc_bool_t b_description = config_GetInt( p_this, "help-verbose" ) > 0; - vlc_bool_t b_description_hack; - vlc_bool_t b_color = config_GetInt( p_this, "color" ) > 0; - vlc_bool_t b_has_advanced = VLC_FALSE; + bool b_advanced = config_GetInt( p_this, "advanced" ) > 0; + bool b_description = config_GetInt( p_this, "help-verbose" ) > 0; + bool b_description_hack; + bool b_color = config_GetInt( p_this, "color" ) > 0; + bool b_has_advanced = false; 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'; #ifdef WIN32 - b_color = VLC_FALSE; // don't put color control codes in a .txt file + b_color = false; // don't put color control codes in a .txt file #endif if( b_color ) @@ -1370,7 +1403,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) /* Enumerate the config for each module */ for( i_index = 0; i_index < p_list->i_count; i_index++ ) { - vlc_bool_t b_help_module; + bool b_help_module; module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object; module_config_t *p_item = NULL; module_config_t *p_end = p_parser->p_config + p_parser->confsize; @@ -1449,7 +1482,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) /* Skip advanced options if requested */ if( p_item->b_advanced && !b_advanced ) { - b_has_advanced = VLC_TRUE; + b_has_advanced = true; continue; } @@ -1713,7 +1746,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) if( b_description_hack && p_item->psz_longtext ) { sprintf( psz_buffer, "%s%s", p_item->psz_longtext, psz_suf ); - b_description_hack = VLC_FALSE; + b_description_hack = false; psz_spaces = psz_spaces_longtext; utf8_fprintf( stdout, "%s", psz_spaces ); goto description; @@ -1741,19 +1774,19 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) * 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_bool_t b_verbose ) +static void ListModules( libvlc_int_t *p_this, bool b_verbose ) { vlc_list_t *p_list = NULL; module_t *p_parser = NULL; char psz_spaces[22]; int i_index; - vlc_bool_t b_color = config_GetInt( p_this, "color" ) > 0; + bool b_color = config_GetInt( p_this, "color" ) > 0; memset( psz_spaces, ' ', 22 ); #ifdef WIN32 - ShowConsole( VLC_TRUE ); + ShowConsole( true ); #endif /* List all modules */ @@ -1829,7 +1862,7 @@ static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose ) static void Version( void ) { #ifdef WIN32 - ShowConsole( VLC_TRUE ); + ShowConsole( true ); #endif utf8_fprintf( stdout, _("VLC version %s\n"), VLC_Version() ); @@ -1852,7 +1885,7 @@ static void Version( void ) * This function is useful only on Win32. *****************************************************************************/ #ifdef WIN32 /* */ -static void ShowConsole( vlc_bool_t b_dofile ) +static void ShowConsole( bool b_dofile ) { # ifndef UNDER_CE FILE *f_help = NULL; @@ -2031,6 +2064,7 @@ static void InitDeviceValues( libvlc_int_t *p_vlc ) #ifdef HAVE_HAL_1 libhal_ctx_shutdown( ctx, NULL ); dbus_connection_unref( p_connection ); + libhal_ctx_free( ctx ); #else hal_shutdown( ctx ); #endif