X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=38e2b8bbc6d4dda137b72ed734d8cefc27231c19;hb=3048882f57f5ec815fe21e1a803fddaff7a58f61;hp=91e16cb65cdb733320e343e9b4dd4914c8d3949d;hpb=14ee5f1254c0aa7cb2e4c01a99fd4d61b009f7e9;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 91e16cb65c..38e2b8bbc6 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 @@ -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 @@ -330,8 +329,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,6 +534,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * 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 @@ -547,11 +551,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 +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] ); @@ -794,6 +793,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,16 +817,17 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, return VLC_EGENERIC; } + /* System specific configuration */ + system_Configure( p_libvlc, &i_argc, ppsz_argv ); + /* Add service discovery modules */ psz_modules = var_InheritString( p_libvlc, "services-discovery" ); if( psz_modules ) { char *p = psz_modules, *m; - playlist_t *p_playlist = pl_Hold( p_libvlc ); while( ( m = strsep( &p, " :," ) ) != NULL ) playlist_ServicesDiscoveryAdd( p_playlist, m ); free( psz_modules ); - pl_Release (p_libvlc); } #ifdef ENABLE_VLM @@ -838,11 +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_VOID ); - var_Create( p_libvlc, "volume-muted", VLC_VAR_BOOL ); - psz_modules = var_CreateGetNonEmptyString( p_libvlc, "extraintf" ); psz_control = var_CreateGetNonEmptyString( p_libvlc, "control" ); @@ -955,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 @@ -975,10 +972,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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 ); } @@ -1203,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--; @@ -1220,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 ); } @@ -1911,7 +1904,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