/* Initialize mutexes */
vlc_mutex_init( &priv->timer_lock );
+ vlc_ExitInit( &priv->exit );
return p_libvlc;
error:
* options) */
module_InitBank( p_libvlc );
- if( config_LoadCmdLine( p_libvlc, i_argc, ppsz_argv, true ) )
+ if( config_LoadCmdLine( p_libvlc, i_argc, ppsz_argv, NULL ) )
{
module_EndBank( p_libvlc, false );
return VLC_EGENERIC;
/*
* 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 ) )
+ int vlc_optind;
+ if( config_LoadCmdLine( p_libvlc, i_argc, ppsz_argv, &vlc_optind ) )
{
#ifdef WIN32
ShowConsole( false );
* We assume that the remaining parameters are filenames
* and their input options.
*/
- msg_Info( p_libvlc, "optind = %u", vlc_optind );
GetFilenames( p_libvlc, i_argc - vlc_optind, ppsz_argv + vlc_optind );
/*
msg_Destroy (priv->msg_bank);
/* Destroy mutexes */
+ vlc_ExitDestroy( &priv->exit );
vlc_mutex_destroy( &priv->timer_lock );
#ifndef NDEBUG /* Hack to dump leaked objects tree */
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
- * when the user "exits" an interface plugin.
- */
-void libvlc_InternalWait( libvlc_int_t *p_libvlc )
-{
- vlc_mutex_lock( &exit_lock );
- while( vlc_object_alive( p_libvlc ) )
- vlc_cond_wait( &exiting, &exit_lock );
- vlc_mutex_unlock( &exit_lock );
-}
-
-/**
- * Posts an exit signal to LibVLC instance. This will normally initiate the
- * cleanup and destroy process. It should only be called on behalf of the user.
- */
-void libvlc_Quit( libvlc_int_t *p_libvlc )
-{
- vlc_mutex_lock( &exit_lock );
- vlc_object_kill( p_libvlc );
- vlc_cond_broadcast( &exiting );
- vlc_mutex_unlock( &exit_lock );
-}
-
#if defined( ENABLE_NLS ) && (defined (__APPLE__) || defined (WIN32)) && \
( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
/*****************************************************************************
* 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';
+ snprintf( psz_lcall, sizeof(psz_lcall), "LC_ALL=%s", psz_lang );
putenv( psz_lcall );
#endif
( b_strict ? strcmp( psz_search, p_parser->psz_object_name )
: !strstr( p_parser->psz_object_name, psz_search ) ) )
{
- char *const *pp_shortcut = p_parser->pp_shortcuts;
- while( *pp_shortcut )
+ char *const *pp_shortcuts = p_parser->pp_shortcuts;
+ unsigned i;
+ for( i = 0; i < p_parser->i_shortcuts; i++ )
{
- if( b_strict ? !strcmp( psz_search, *pp_shortcut )
- : !!strstr( *pp_shortcut, psz_search ) )
+ if( b_strict ? !strcmp( psz_search, pp_shortcuts[i] )
+ : !!strstr( pp_shortcuts[i], psz_search ) )
break;
- pp_shortcut ++;
}
- if( !*pp_shortcut )
+ if( i == p_parser->i_shortcuts )
continue;
}
if( b_verbose )
{
- char *const *pp_shortcut = p_parser->pp_shortcuts;
- while( *pp_shortcut )
+ char *const *pp_shortcuts = p_parser->pp_shortcuts;
+ for( unsigned i = 0; i < p_parser->i_shortcuts; i++ )
{
- if( strcmp( *pp_shortcut, p_parser->psz_object_name ) )
+ if( strcmp( pp_shortcuts[i], p_parser->psz_object_name ) )
{
if( b_color )
utf8_fprintf( stdout, CYAN" s %s\n"GRAY,
- *pp_shortcut );
+ pp_shortcuts[i] );
else
utf8_fprintf( stdout, " s %s\n",
- *pp_shortcut );
+ pp_shortcuts[i] );
}
- pp_shortcut++;
}
if( p_parser->psz_capability )
{
return i_width;
}
-
-#include <vlc_avcodec.h>
-
-void vlc_avcodec_mutex (bool acquire)
-{
- static vlc_mutex_t lock = VLC_STATIC_MUTEX;
-
- if (acquire)
- vlc_mutex_lock (&lock);
- else
- vlc_mutex_unlock (&lock);
-}