X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-common.c;h=f97f4defc175d9745d5e9a7159a4a9932965a121;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=657f9c83fbef4aa4bd079d6751963c48500f1d79;hpb=f5a65159a180f89e21a1c0e2fea512c73f178027;p=vlc diff --git a/src/libvlc-common.c b/src/libvlc-common.c index 657f9c83fb..f97f4defc1 100644 --- a/src/libvlc-common.c +++ b/src/libvlc-common.c @@ -94,7 +94,7 @@ * The evil global variable. We handle it with care, don't worry. *****************************************************************************/ static libvlc_global_data_t libvlc_global; -static libvlc_global_data_t * p_libvlc_global = NULL; +#define p_libvlc_global (&libvlc_global) static libvlc_int_t * p_static_vlc = NULL; static volatile unsigned int i_instances = 0; @@ -122,8 +122,10 @@ static int VerboseCallback( vlc_object_t *, char const *, static void InitDeviceValues( libvlc_int_t * ); -/* Refs misc/cpu.c */ -uint32_t CPUCapabilities( void ); +libvlc_global_data_t *vlc_global( void ) +{ + return &libvlc_global; +} /***************************************************************************** * vlc_current_object: return the current object. @@ -153,9 +155,11 @@ libvlc_int_t * libvlc_InternalCreate( void ) vlc_value_t lockval; char *psz_env = NULL; +#if 0 /* &libvlc_global never changes, * so we can safely call this multiple times. */ p_libvlc_global = &libvlc_global; +#endif /* vlc_threads_init *must* be the first internal call! No other call is * allowed before the thread system has been initialized. */ @@ -173,7 +177,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) if( !libvlc_global.b_ready ) { /* Guess what CPU we have */ - libvlc_global.i_cpu = CPUCapabilities(); + cpu_flags = CPUCapabilities(); /* The module bank will be initialized later */ libvlc_global.p_module_bank = NULL; @@ -189,7 +193,6 @@ libvlc_int_t * libvlc_InternalCreate( void ) i_instances--; return NULL; } - p_libvlc->thread_id = 0; p_libvlc->p_playlist = NULL; p_libvlc->psz_object_name = "libvlc"; @@ -215,8 +218,6 @@ libvlc_int_t * libvlc_InternalCreate( void ) vlc_mutex_init( p_libvlc, &p_libvlc->quicktime_lock ); vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW ); #endif - /* Fake attachment */ - p_libvlc->b_attached = VLC_TRUE; /* Store data for the non-reentrant API */ p_static_vlc = p_libvlc; @@ -324,25 +325,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) } /* Set the config file stuff */ - p_libvlc->psz_homedir = config_GetHomeDir(); - p_libvlc->psz_userdir = config_GetUserDir(); - if( p_libvlc->psz_userdir == NULL ) - p_libvlc->psz_userdir = strdup(p_libvlc->psz_homedir); - p_libvlc->psz_configfile = config_GetPsz( p_libvlc, "config" ); - if( (p_libvlc->psz_configfile != NULL) && (p_libvlc->psz_configfile[0] == '~') - && (p_libvlc->psz_configfile[1] == '/') ) - { - char *psz = malloc( strlen(p_libvlc->psz_userdir) - + strlen(p_libvlc->psz_configfile) ); - if( psz ) - { - /* This is incomplete : we should also support the ~cmassiot/ syntax. */ - sprintf( psz, "%s/%s", p_libvlc->psz_userdir, - p_libvlc->psz_configfile + 2 ); - free( p_libvlc->psz_configfile ); - p_libvlc->psz_configfile = psz; - } /* else keep old config stuff */ - } + p_libvlc->psz_homedir = config_GetHomeDir(); + p_libvlc->psz_configdir = config_GetConfigDir( p_libvlc ); + p_libvlc->psz_datadir = config_GetUserDataDir( p_libvlc ); + p_libvlc->psz_cachedir = config_GetCacheDir( p_libvlc ); + p_libvlc->psz_configfile = config_GetCustomConfigFile( p_libvlc ); /* Check for plugins cache options */ if( config_GetInt( p_libvlc, "reset-plugins-cache" ) ) @@ -369,7 +356,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" ); b_exit = VLC_TRUE; } - p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE; + libvlc_global.b_daemon = VLC_TRUE; /* lets check if we need to write the pidfile */ psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); @@ -416,7 +403,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) close( STDOUT_FILENO ); close( STDERR_FILENO ); - p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE; + libvlc_global.b_daemon = VLC_TRUE; } #endif } @@ -606,13 +593,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) } else { - /* check if a Media Player is available + /* check if VLC is available on the bus * if not: D-Bus control is not enabled on the other * instance and we can't pass MRLs to it */ DBusMessage *p_test_msg = NULL; DBusMessage *p_test_reply = NULL; p_test_msg = dbus_message_new_method_call( - "org.freedesktop.MediaPlayer", "/", + "org.mpris.vlc", "/", "org.freedesktop.MediaPlayer", "Identity" ); /* block until a reply arrives */ p_test_reply = dbus_connection_send_with_reply_and_block( @@ -641,7 +628,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) ppsz_argv[i_input] ); p_dbus_msg = dbus_message_new_method_call( - "org.freedesktop.MediaPlayer", "/TrackList", + "org.mpris.vlc", "/TrackList", "org.freedesktop.MediaPlayer", "AddTrack" ); if ( NULL == p_dbus_msg ) @@ -653,7 +640,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) /* append MRLs */ dbus_message_iter_init_append( p_dbus_msg, &dbus_args ); - if ( !dbus_message_iter_append_basic( &dbus_args, + if ( !dbus_message_iter_append_basic( &dbus_args, DBUS_TYPE_STRING, &ppsz_argv[i_input] ) ) { msg_Err( p_libvlc, "Out of memory" ); @@ -728,27 +715,27 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) msg_Flush( p_libvlc ); if( !config_GetInt( p_libvlc, "fpu" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_FPU; + cpu_flags &= ~CPU_CAPABILITY_FPU; #if defined( __i386__ ) || defined( __x86_64__ ) if( !config_GetInt( p_libvlc, "mmx" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_MMX; + cpu_flags &= ~CPU_CAPABILITY_MMX; if( !config_GetInt( p_libvlc, "3dn" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_3DNOW; + cpu_flags &= ~CPU_CAPABILITY_3DNOW; if( !config_GetInt( p_libvlc, "mmxext" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_MMXEXT; + cpu_flags &= ~CPU_CAPABILITY_MMXEXT; if( !config_GetInt( p_libvlc, "sse" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_SSE; + cpu_flags &= ~CPU_CAPABILITY_SSE; if( !config_GetInt( p_libvlc, "sse2" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_SSE2; + cpu_flags &= ~CPU_CAPABILITY_SSE2; #endif #if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ ) if( !config_GetInt( p_libvlc, "altivec" ) ) - libvlc_global.i_cpu &= ~CPU_CAPABILITY_ALTIVEC; + cpu_flags &= ~CPU_CAPABILITY_ALTIVEC; #endif #define PRINT_CAPABILITY( capability, string ) \ - if( libvlc_global.i_cpu & capability ) \ + if( vlc_CPU() & capability ) \ { \ strncat( p_capabilities, string " ", \ sizeof(p_capabilities) - strlen(p_capabilities) ); \ @@ -906,6 +893,26 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE ); } +#ifdef WIN32 + if( config_GetInt( p_libvlc, "prefer-system-codecs") == 1 ) + { + char *psz_codecs = config_GetPsz( p_playlist, "codec" ); + if( psz_codecs ) + { + char *psz_morecodecs; + asprintf(&psz_morecodecs, "%s,dmo,quicktime", psz_codecs); + if( psz_morecodecs ) + { + config_PutPsz( p_libvlc, "codec", psz_morecodecs); + free(psz_morecodecs); + } + } + else + config_PutPsz( p_libvlc, "codec", "dmo,quicktime"); + free(psz_codecs); + } +#endif + /* * FIXME: kludge to use a p_libvlc-local variable for the Mozilla plugin */ @@ -1019,7 +1026,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) #ifndef WIN32 char* psz_pidfile = NULL; - if( p_libvlc->p_libvlc_global->p_module_bank ) + if( libvlc_global.p_module_bank ) if( config_GetInt( p_libvlc, "daemon" ) ) { psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); @@ -1046,7 +1053,9 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) module_EndBank( p_libvlc ); FREENULL( p_libvlc->psz_homedir ); - FREENULL( p_libvlc->psz_userdir ); + FREENULL( p_libvlc->psz_configdir ); + FREENULL( p_libvlc->psz_datadir ); + FREENULL( p_libvlc->psz_cachedir ); FREENULL( p_libvlc->psz_configfile ); FREENULL( p_libvlc->p_hotkeys ); @@ -1075,7 +1084,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) p_libvlc = NULL; /* Stop thread system: last one out please shut the door! - * The number of initializations of the thread system is counted, we + * The number of initializations of the thread system is counted, we * can call this each time */ vlc_threads_end( p_libvlc_global ); @@ -1097,7 +1106,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, return VLC_EGENERIC; #ifndef WIN32 - if( p_libvlc->p_libvlc_global->b_daemon && b_block && !psz_module ) + if( libvlc_global.b_daemon && b_block && !psz_module ) { /* Daemon mode hack. * We prefer the dummy interface if none is specified. */ @@ -1357,7 +1366,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) if( psz_module_name && strcmp( psz_module_name, p_parser->psz_object_name ) ) { - const char **pp_shortcut = p_parser->pp_shortcuts; + const char *const *pp_shortcut = p_parser->pp_shortcuts; while( *pp_shortcut ) { if( !strcmp( psz_module_name, *pp_shortcut ) ) @@ -1750,8 +1759,8 @@ static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose ) if( b_verbose ) { - const char **pp_shortcut = p_parser->pp_shortcuts; - while( pp_shortcut && *pp_shortcut ) + const char *const *pp_shortcut = p_parser->pp_shortcuts; + while( *pp_shortcut ) { if( strcmp( *pp_shortcut, p_parser->psz_object_name ) ) { @@ -1810,11 +1819,9 @@ static void Version( void ) utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"), VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() ); utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); -#ifndef HAVE_SHARED_LIBVLC if( strcmp( VLC_Changeset(), "exported" ) ) utf8_fprintf( stdout, _("Based upon svn changeset [%s]\n"), VLC_Changeset() ); -#endif utf8_fprintf( stdout, LICENSE_MSG ); #ifdef WIN32 /* Pause the console because it's destroyed when we exit */ @@ -1952,7 +1959,6 @@ static void InitDeviceValues( libvlc_int_t *p_vlc ) p_connection = dbus_bus_get ( DBUS_BUS_SYSTEM, &error ); if( dbus_error_is_set( &error ) || !p_connection ) { - libhal_ctx_shutdown( ctx, NULL ); dbus_error_free( &error ); return; }