X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=b11f40fc1ef69ddb86bcd93c275bc0f8468864d6;hb=64da2d69863680f9298f1a1b32131ce2c51fb468;hp=961671bbf98fd258e3622fc9a2318f9bf53b7a89;hpb=c029b7afbe9dd9f0f2be5347021f7776d896b73b;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 961671bbf9..b11f40fc1e 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 @@ -77,6 +75,7 @@ #include "audio_output/aout_internal.h" #include +#include #include #include @@ -205,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 ); @@ -218,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 @@ -240,7 +240,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) } /* Allocate a libvlc instance object */ - p_libvlc = __vlc_custom_create( NULL, sizeof (*priv), + p_libvlc = vlc_custom_create( (vlc_object_t *)NULL, sizeof (*priv), VLC_OBJECT_GENERIC, "libvlc" ); if( p_libvlc != NULL ) i_instances++; @@ -255,7 +255,9 @@ libvlc_int_t * libvlc_InternalCreate( void ) priv->p_vlm = NULL; /* Initialize message queue */ - msg_Create( p_libvlc ); + priv->msg_bank = msg_Create (); + if (unlikely(priv->msg_bank == NULL)) + goto error; /* Find verbosity from VLC_VERBOSE environment variable */ psz_env = getenv( "VLC_VERBOSE" ); @@ -273,6 +275,9 @@ libvlc_int_t * libvlc_InternalCreate( void ) vlc_mutex_init( &priv->timer_lock ); return p_libvlc; +error: + vlc_object_release (p_libvlc); + return NULL; } /** @@ -316,7 +321,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; @@ -324,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") ); @@ -366,7 +373,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, pid_t i_pid = getpid (); msg_Dbg( p_libvlc, "PID is %d, writing it to %s", i_pid, psz_pidfile ); - pidfile = utf8_fopen( psz_pidfile,"w" ); + pidfile = vlc_fopen( psz_pidfile,"w" ); if( pidfile != NULL ) { utf8_fprintf( pidfile, "%d", (int)i_pid ); @@ -527,7 +534,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 ); @@ -541,11 +549,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(); @@ -599,7 +602,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] ); @@ -788,6 +791,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 ); @@ -805,16 +815,17 @@ 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 ) { 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_playlist); } #ifdef ENABLE_VLM @@ -832,11 +843,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" ); @@ -949,19 +955,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 @@ -969,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 ); } @@ -1009,9 +1010,8 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) } #endif - /* Free playlist now */ - msg_Dbg( p_libvlc, "removing playlist" ); - vlc_object_release( p_playlist ); + /* Free playlist now, all threads are gone */ + playlist_Destroy( p_playlist ); stats_TimersDumpAll( p_libvlc ); stats_TimersCleanAll( p_libvlc ); @@ -1070,7 +1070,7 @@ void libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) } vlc_mutex_unlock( &global_lock ); - msg_Destroy( p_libvlc ); + msg_Destroy (priv->msg_bank); /* Destroy mutexes */ vlc_mutex_destroy( &priv->timer_lock ); @@ -1177,8 +1177,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 @@ -1192,38 +1191,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_t *p_playlist = pl_Hold( p_vlc ); - playlist_AddExt( p_playlist, mrl, NULL, PLAYLIST_INSERT, - 0, -1, i_options, ( i_options ? &ppsz_argv[i_opt + 1] : NULL ), + playlist_AddExt( pl_Get( p_vlc ), mrl, NULL, PLAYLIST_INSERT, + 0, -1, i_options, ( i_options ? &args[n + 1] : NULL ), VLC_INPUT_OPTION_TRUSTED, true, pl_Unlocked ); - pl_Release( p_vlc ); free( mrl ); } - - return VLC_SUCCESS; } /***************************************************************************** @@ -1906,7 +1902,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