# include <io.h>
#endif
-#ifdef WIN32 /* optind, getopt(), included in unistd.h */
-# include "extras/getopt.h"
-#endif
+#include "config/vlc_getopt.h"
#ifdef HAVE_LOCALE_H
# include <locale.h>
( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
static void SetLanguage ( char const * );
#endif
-static int GetFilenames ( libvlc_int_t *, int, const char *[] );
+static void GetFilenames ( libvlc_int_t *, unsigned, const char *const [] );
static void Help ( libvlc_int_t *, char const *psz_help_name );
static void Usage ( libvlc_int_t *, char const *psz_search );
static void ListModules ( libvlc_int_t *, bool );
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
/* 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;
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") );
/*
* Override configuration with command line settings
*/
- 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 );
}
priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" );
- /*
- * System specific configuration
- */
- system_Configure( p_libvlc, &i_argc, ppsz_argv );
-
/* FIXME: could be replaced by using Unix sockets */
#ifdef HAVE_DBUS
dbus_threads_init_default();
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] );
*/
vlc_InitActions( p_libvlc );
+ /* 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 );
var_Create( p_libvlc, "record-file", VLC_VAR_STRING );
return VLC_EGENERIC;
}
+ /* System specific configuration */
+ system_Configure( p_libvlc, i_argc - vlc_optind, ppsz_argv + vlc_optind );
+
/* Add service discovery modules */
psz_modules = var_InheritString( p_libvlc, "services-discovery" );
if( psz_modules )
/*
* 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_VOID );
- var_Create( p_libvlc, "volume-muted", VLC_VAR_BOOL );
-
psz_modules = var_CreateGetNonEmptyString( p_libvlc, "extraintf" );
psz_control = var_CreateGetNonEmptyString( p_libvlc, "control" );
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
+ * Get input filenames given as commandline arguments.
+ * We assume that the remaining parameters are filenames
+ * and their input options.
*/
- GetFilenames( p_libvlc, i_argc, ppsz_argv );
+ GetFilenames( p_libvlc, i_argc - vlc_optind, ppsz_argv + vlc_optind );
/*
* Get --open argument
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
* 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, const char *ppsz_argv[] )
+static void GetFilenames( libvlc_int_t *p_vlc, unsigned n,
+ const char *const args[] )
{
- 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-- )
+ while( n > 0 )
{
- i_options = 0;
-
/* Count the input options */
- while( *ppsz_argv[ i_opt ] == ':' && i_opt > optind )
+ unsigned i_options = 0;
+
+ while( args[--n][0] == ':' )
{
i_options++;
- i_opt--;
+ if( n == 0 )
+ {
+ msg_Warn( p_vlc, "options %s without item", args[n] );
+ return; /* syntax!? */
+ }
}
/* TODO: write an internal function of this one, to avoid
* unnecessary lookups. */
- char *mrl = make_URI( ppsz_argv[i_opt] );
+ char *mrl = make_URI( args[n] );
if( !mrl )
continue;
playlist_AddExt( pl_Get( p_vlc ), mrl, NULL, PLAYLIST_INSERT,
- 0, -1, i_options, ( i_options ? &ppsz_argv[i_opt + 1] : NULL ),
+ 0, -1, i_options, ( i_options ? &args[n + 1] : NULL ),
VLC_INPUT_OPTION_TRUSTED, true, pl_Unlocked );
free( mrl );
}
-
- return VLC_SUCCESS;
}
/*****************************************************************************
( 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 )
{
*****************************************************************************/
static void Version( void )
{
- extern const char psz_vlc_changeset[];
#ifdef WIN32
ShowConsole( true );
#endif
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);
-}
projects / vlc / blobdiff