X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=efd4952445624efa3436cd354c03e98b3b4df537;hb=99f71e5a62fdd14b031fdc89f452d873e3509c74;hp=58f588a5ea70fcea0911fd2e91a641cb418b2406;hpb=2932220e9ed7d99f8b8397f1b578c9f0a3a1aa3b;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 58f588a5ea..efd4952445 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -57,9 +57,7 @@ # 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 @@ -206,7 +204,7 @@ void vlc_release (gc_object_t *p_gc) ( 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 ); @@ -219,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 @@ -274,6 +273,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) /* Initialize mutexes */ vlc_mutex_init( &priv->timer_lock ); + vlc_ExitInit( &priv->exit ); return p_libvlc; error: @@ -322,7 +322,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, true ) ) + if( config_LoadCmdLine( p_libvlc, i_argc, ppsz_argv, NULL ) ) { module_EndBank( p_libvlc, false ); return VLC_EGENERIC; @@ -330,8 +330,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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") ); @@ -533,7 +535,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * 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 ); @@ -547,11 +550,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } 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(); @@ -605,7 +603,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] ); @@ -794,6 +792,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, */ 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 ); @@ -811,6 +816,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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 ) @@ -948,19 +956,16 @@ 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 + * 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 @@ -1069,6 +1074,7 @@ void libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) 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 */ @@ -1117,40 +1123,6 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) 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 ) ) /***************************************************************************** @@ -1173,8 +1145,7 @@ static void SetLanguage ( const char *psz_lang ) * 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 @@ -1188,36 +1159,35 @@ static void SetLanguage ( const char *psz_lang ) * 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; } /***************************************************************************** @@ -1421,15 +1391,15 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) ( 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; } @@ -1859,19 +1829,18 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) 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 ) { @@ -1900,7 +1869,6 @@ 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 @@ -1999,15 +1967,3 @@ static int ConsoleWidth( void ) return i_width; } - -#include - -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); -}