X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=28408539fac1977888f456257e7379abd4d6fea5;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=4a9d5eb5da310e54cf31075a064f44b5f4c3acf3;hpb=ec56260552eb41d3931949a54453caba058acc78;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 4a9d5eb5da..28408539fa 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 @@ -70,6 +68,8 @@ # include #endif + +#include #include #include @@ -77,8 +77,11 @@ #include "audio_output/aout_internal.h" #include +#include #include #include +#include +#include #include "libvlc.h" @@ -117,18 +120,7 @@ void *vlc_gc_init (gc_object_t *p_gc, void (*pf_destruct) (gc_object_t *)) assert (pf_destruct); p_gc->pf_destructor = pf_destruct; - p_gc->refs = 1; -#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) - __sync_synchronize (); -#elif defined (WIN32) && defined (__GNUC__) -#elif defined(__APPLE__) - OSMemoryBarrier (); -#else - /* Nobody else can possibly lock the spin - it's there as a barrier */ - vlc_spin_init (&p_gc->spin); - vlc_spin_lock (&p_gc->spin); - vlc_spin_unlock (&p_gc->spin); -#endif + vlc_atomic_set (&p_gc->refs, 1); return p_gc; } @@ -140,22 +132,9 @@ void *vlc_gc_init (gc_object_t *p_gc, void (*pf_destruct) (gc_object_t *)) void *vlc_hold (gc_object_t * p_gc) { uintptr_t refs; + assert( p_gc ); - assert ((((uintptr_t)&p_gc->refs) & (sizeof (void *) - 1)) == 0); /* alignment */ - -#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) - refs = __sync_add_and_fetch (&p_gc->refs, 1); -#elif defined (WIN64) - refs = InterlockedIncrement64 (&p_gc->refs); -#elif defined (WIN32) - refs = InterlockedIncrement (&p_gc->refs); -#elif defined(__APPLE__) - refs = OSAtomicIncrement32Barrier((int*)&p_gc->refs); -#else - vlc_spin_lock (&p_gc->spin); - refs = ++p_gc->refs; - vlc_spin_unlock (&p_gc->spin); -#endif + refs = vlc_atomic_inc (&p_gc->refs); assert (refs != 1); /* there had to be a reference already */ return p_gc; } @@ -169,33 +148,10 @@ void vlc_release (gc_object_t *p_gc) unsigned refs; assert( p_gc ); - assert ((((uintptr_t)&p_gc->refs) & (sizeof (void *) - 1)) == 0); /* alignment */ - -#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) - refs = __sync_sub_and_fetch (&p_gc->refs, 1); -#elif defined (WIN64) - refs = InterlockedDecrement64 (&p_gc->refs); -#elif defined (WIN32) - refs = InterlockedDecrement (&p_gc->refs); -#elif defined(__APPLE__) - refs = OSAtomicDecrement32Barrier((int*)&p_gc->refs); -#else - vlc_spin_lock (&p_gc->spin); - refs = --p_gc->refs; - vlc_spin_unlock (&p_gc->spin); -#endif - + refs = vlc_atomic_dec (&p_gc->refs); assert (refs != (uintptr_t)(-1)); /* reference underflow?! */ if (refs == 0) - { -#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) -#elif defined (WIN32) && defined (__GNUC__) -#elif defined(__APPLE__) -#else - vlc_spin_destroy (&p_gc->spin); -#endif p_gc->pf_destructor (p_gc); - } } /***************************************************************************** @@ -205,7 +161,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 +174,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 @@ -251,6 +208,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) priv = libvlc_priv (p_libvlc); priv->p_playlist = NULL; + priv->p_ml = NULL; priv->p_dialog_provider = NULL; priv->p_vlm = NULL; @@ -272,7 +230,9 @@ libvlc_int_t * libvlc_InternalCreate( void ) #endif /* Initialize mutexes */ + vlc_mutex_init( &priv->ml_lock ); vlc_mutex_init( &priv->timer_lock ); + vlc_ExitInit( &priv->exit ); return p_libvlc; error: @@ -321,7 +281,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; @@ -329,8 +289,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") ); @@ -371,7 +333,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 ); @@ -532,7 +494,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 ); @@ -546,11 +509,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(); @@ -604,7 +562,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] ); @@ -793,10 +751,22 @@ 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 ); + /* some default internal settings */ + var_Create( p_libvlc, "window", VLC_VAR_STRING ); + var_Create( p_libvlc, "user-agent", VLC_VAR_STRING ); + var_SetString( p_libvlc, "user-agent", "(LibVLC "VERSION")" ); + /* Initialize playlist and get commandline files */ p_playlist = playlist_Create( VLC_OBJECT(p_libvlc) ); if( !p_playlist ) @@ -810,16 +780,34 @@ 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 ); + +#if defined(MEDIA_LIBRARY) + /* Get the ML */ + if( var_GetBool( p_libvlc, "load-media-library-on-startup" ) == true ) + { + priv->p_ml = ml_Create( VLC_OBJECT( p_libvlc ), NULL ); + if( !priv->p_ml ) + { + msg_Err( p_libvlc, "ML initialization failed" ); + return VLC_EGENERIC; + } + } + else + { + priv->p_ml = NULL; + } +#endif + /* 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 @@ -837,11 +825,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" ); @@ -934,7 +917,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( psz_codecs ) { char *psz_morecodecs; - if( asprintf(&psz_morecodecs, "%s,dmo,quicktime", psz_codecs) != -1 ) + if( asprintf(&psz_morecodecs, "%s,dmo", psz_codecs) != -1 ) { var_SetString( p_libvlc, "codec", psz_morecodecs); free( psz_morecodecs ); @@ -942,10 +925,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, free( psz_codecs ); } else - var_SetString( p_libvlc, "codec", "dmo,quicktime"); + var_SetString( p_libvlc, "codec", "dmo"); } #endif +#ifdef __APPLE__ var_Create( p_libvlc, "drawable-view-top", VLC_VAR_INTEGER ); var_Create( p_libvlc, "drawable-view-left", VLC_VAR_INTEGER ); var_Create( p_libvlc, "drawable-view-bottom", VLC_VAR_INTEGER ); @@ -954,19 +938,17 @@ 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 ); +#endif +#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 @@ -974,10 +956,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 ); } @@ -1014,9 +994,18 @@ 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 ); + +#if defined(MEDIA_LIBRARY) + media_library_t* p_ml = priv->p_ml; + if( p_ml ) + { + ml_Destroy( VLC_OBJECT( p_ml ) ); + vlc_object_release( p_ml ); + libvlc_priv(p_playlist->p_libvlc)->p_ml = NULL; + } +#endif stats_TimersDumpAll( p_libvlc ); stats_TimersCleanAll( p_libvlc ); @@ -1078,7 +1067,9 @@ 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 ); + vlc_mutex_destroy( &priv->ml_lock ); #ifndef NDEBUG /* Hack to dump leaked objects tree */ if( vlc_internals( p_libvlc )->i_refcount > 1 ) @@ -1126,40 +1117,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 ) ) /***************************************************************************** @@ -1182,8 +1139,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 @@ -1197,38 +1153,33 @@ 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], NULL ); 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; } /***************************************************************************** @@ -1306,6 +1257,7 @@ static void Help( libvlc_int_t *p_this, char const *psz_help_name ) #ifdef WIN32 /* Pause the console because it's destroyed when we exit */ PauseConsole(); #endif + fflush( stdout ); } /***************************************************************************** @@ -1331,7 +1283,7 @@ print_help_section( const module_t *m, const module_config_t *p_item, { utf8_fprintf( stdout, RED" %s:\n"GRAY, module_gettext( m, p_item->psz_text ) ); - if( b_description && p_item->psz_longtext && *p_item->psz_longtext ) + if( b_description && p_item->psz_longtext ) utf8_fprintf( stdout, MAGENTA" %s\n"GRAY, module_gettext( m, p_item->psz_longtext ) ); } @@ -1339,7 +1291,7 @@ print_help_section( const module_t *m, const module_config_t *p_item, { utf8_fprintf( stdout, " %s:\n", module_gettext( m, p_item->psz_text ) ); - if( b_description && p_item->psz_longtext && *p_item->psz_longtext ) + if( b_description && p_item->psz_longtext ) utf8_fprintf( stdout, " %s\n", module_gettext(m, p_item->psz_longtext ) ); } @@ -1432,15 +1384,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; } @@ -1533,8 +1485,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) utf8_fprintf( stdout, "\n %s\n", module_gettext( p_parser, p_item->psz_text ) ); } - if( b_description && p_item->psz_longtext - && *p_item->psz_longtext ) + if( b_description && p_item->psz_longtext ) { if( b_color ) utf8_fprintf( stdout, CYAN " %s\n" GRAY, @@ -1592,8 +1543,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) if( p_item->min.i || p_item->max.i ) { - sprintf( psz_buffer, "%s [%i .. %i]", psz_type, - p_item->min.i, p_item->max.i ); + sprintf( psz_buffer, "%s [%"PRId64" .. %"PRId64"]", + psz_type, p_item->min.i, p_item->max.i ); psz_type = psz_buffer; } @@ -1780,8 +1731,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) } } - if( b_description_hack && p_item->psz_longtext - && *p_item->psz_longtext ) + if( b_description_hack && p_item->psz_longtext ) { sprintf( psz_buffer, "%s%s", module_gettext( p_parser, p_item->psz_longtext ), @@ -1870,19 +1820,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 ) { @@ -1911,7 +1860,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 @@ -2010,15 +1958,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); -}