X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=3543e96f6ba9434ba2a5041090046366ef7a635a;hb=80158557a6793a52dac40fa2a75c627b3366ca9c;hp=746e6407d72b8c8409e1655ad13e4c48af06f460;hpb=0565b5c2e5062b41e6e1d2b441724899bfdcf38d;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 746e6407d7..3543e96f6b 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -277,7 +277,6 @@ libvlc_int_t * libvlc_InternalCreate( void ) /* Initialize mutexes */ vlc_mutex_init( &priv->timer_lock ); - vlc_cond_init( &priv->exiting ); return p_libvlc; } @@ -369,7 +368,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, b_daemon = true; /* lets check if we need to write the pidfile */ - psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); + psz_pidfile = var_CreateGetNonEmptyString( p_libvlc, "pidfile" ); if( psz_pidfile != NULL ) { FILE *pidfile; @@ -438,8 +437,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); /* Check if the user specified a custom language */ - psz_language = config_GetPsz( p_libvlc, "language" ); - if( psz_language && *psz_language && strcmp( psz_language, "auto" ) ) + psz_language = var_CreateGetNonEmptyString( p_libvlc, "language" ); + if( psz_language && strcmp( psz_language, "auto" ) ) { /* Reset the default domain */ SetLanguage( psz_language ); @@ -476,7 +475,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, msg_Dbg( p_libvlc, "module bank initialized (%zu modules)", module_count ); /* Check for help on modules */ - if( (p_tmp = config_GetPsz( p_libvlc, "module" )) ) + if( (p_tmp = var_CreateGetNonEmptyString( p_libvlc, "module" )) ) { Help( p_libvlc, p_tmp ); free( p_tmp ); @@ -530,6 +529,14 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } } + if( module_count <= 1) + { + msg_Err( p_libvlc, "No modules were found, refusing to start. Check " + "that you properly gave a module path with --plugin-path."); + b_exit = true; + i_ret = VLC_ENOITEM; + } + if( b_exit ) { module_EndBank( p_libvlc, true ); @@ -690,7 +697,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Message queue options */ - char * psz_verbose_objects = config_GetPsz( p_libvlc, "verbose-objects" ); + char * psz_verbose_objects = var_CreateGetNonEmptyString( p_libvlc, "verbose-objects" ); if( psz_verbose_objects ) { char * psz_object, * iter = psz_verbose_objects; @@ -727,9 +734,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( priv->b_color ) priv->b_color = config_GetInt( p_libvlc, "color" ) > 0; - if( !config_GetInt( p_libvlc, "fpu" ) ) - cpu_flags &= ~CPU_CAPABILITY_FPU; - char p_capabilities[200]; #define PRINT_CAPABILITY( capability, string ) \ if( vlc_CPU() & capability ) \ @@ -753,6 +757,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, cpu_flags &= ~CPU_CAPABILITY_SSE2; if( !config_GetInt( p_libvlc, "sse3" ) ) cpu_flags &= ~CPU_CAPABILITY_SSE3; + if( !config_GetInt( p_libvlc, "ssse3" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSSE3; + if( !config_GetInt( p_libvlc, "sse41" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSE4_1; + if( !config_GetInt( p_libvlc, "sse42" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSE4_2; PRINT_CAPABILITY( CPU_CAPABILITY_MMX, "MMX" ); PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" ); @@ -760,6 +770,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, PRINT_CAPABILITY( CPU_CAPABILITY_SSE, "SSE" ); PRINT_CAPABILITY( CPU_CAPABILITY_SSE2, "SSE2" ); PRINT_CAPABILITY( CPU_CAPABILITY_SSE3, "SSE3" ); + PRINT_CAPABILITY( CPU_CAPABILITY_SSE3, "SSSE3" ); + PRINT_CAPABILITY( CPU_CAPABILITY_SSE4_1, "SSE4.1" ); + PRINT_CAPABILITY( CPU_CAPABILITY_SSE4_2, "SSE4.2" ); + PRINT_CAPABILITY( CPU_CAPABILITY_SSE4A, "SSE4A" ); #elif defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ ) if( !config_GetInt( p_libvlc, "altivec" ) ) @@ -772,7 +786,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #endif - PRINT_CAPABILITY( CPU_CAPABILITY_FPU, "FPU" ); +#if HAVE_FPU + strncat( p_capabilities, "FPU ", + sizeof(p_capabilities) - strlen( p_capabilities) ); + p_capabilities[sizeof(p_capabilities) - 1] = '\0'; +#endif + msg_Dbg( p_libvlc, "CPU has capabilities %s", p_capabilities ); /* @@ -791,27 +810,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Initialize hotkey handling */ - var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER ); - var_Create( p_libvlc, "key-action", VLC_VAR_INTEGER ); - { - struct hotkey *p_keys = - malloc( (libvlc_actions_count + 1) * sizeof (*p_keys) ); - - /* Initialize from configuration */ - for( size_t i = 0; i < libvlc_actions_count; i++ ) - { - p_keys[i].psz_action = libvlc_actions[i].name; - p_keys[i].i_key = config_GetInt( p_libvlc, - libvlc_actions[i].name ); - p_keys[i].i_action = libvlc_actions[i].value; - } - p_keys[libvlc_actions_count].psz_action = NULL; - p_keys[libvlc_actions_count].i_key = 0; - p_keys[libvlc_actions_count].i_action = 0; - p_libvlc->p_hotkeys = p_keys; - var_AddCallback( p_libvlc, "key-pressed", vlc_key_to_action, - p_keys ); - } + vlc_InitActions( p_libvlc ); /* variables for signalling creation of new files */ var_Create( p_libvlc, "snapshot-file", VLC_VAR_STRING ); @@ -833,8 +832,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, vlc_object_attach( p_playlist, p_libvlc ); /* Add service discovery modules */ - psz_modules = config_GetPsz( p_playlist, "services-discovery" ); - if( psz_modules && *psz_modules ) + psz_modules = var_CreateGetNonEmptyString( p_playlist, "services-discovery" ); + if( psz_modules ) { char *p = psz_modules, *m; while( ( m = strsep( &p, " :," ) ) != NULL ) @@ -844,8 +843,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #ifdef ENABLE_VLM /* Initialize VLM if vlm-conf is specified */ - psz_parser = config_GetPsz( p_libvlc, "vlm-conf" ); - if( psz_parser && *psz_parser ) + psz_parser = var_CreateGetNonEmptyString( p_libvlc, "vlm-conf" ); + if( psz_parser ) { priv->p_vlm = vlm_New( p_libvlc ); if( !priv->p_vlm ) @@ -859,12 +858,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, */ /* 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_BOOL ); + var_Create( p_libvlc, "volume-change", VLC_VAR_VOID ); + var_Create( p_libvlc, "volume-muted", VLC_VAR_BOOL ); - psz_modules = config_GetPsz( p_libvlc, "extraintf" ); - psz_control = config_GetPsz( p_libvlc, "control" ); + psz_modules = var_CreateGetNonEmptyString( p_libvlc, "extraintf" ); + psz_control = var_CreateGetNonEmptyString( p_libvlc, "control" ); - if( psz_modules && *psz_modules && psz_control && *psz_control ) + if( psz_modules && psz_control ) { char* psz_tmp; if( asprintf( &psz_tmp, "%s:%s", psz_modules, psz_control ) != -1 ) @@ -873,7 +873,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, psz_modules = psz_tmp; } } - else if( psz_control && *psz_control ) + else if( psz_control ) { free( psz_modules ); psz_modules = strdup( psz_control ); @@ -912,21 +912,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, && config_GetInt( p_libvlc, "started-from-file" ) ) ) intf_Create( p_libvlc, "dbus,none" ); +# if !defined (HAVE_MAEMO) /* Prevents the power management daemon from suspending the system * when VLC is active */ if( config_GetInt( p_libvlc, "inhibit" ) > 0 ) intf_Create( p_libvlc, "inhibit,none" ); -#endif - - /* - * If needed, load the Xscreensaver interface - * Currently, only for X - */ -#ifdef HAVE_X11_XLIB_H - if( config_GetInt( p_libvlc, "disable-screensaver" ) ) - { - intf_Create( p_libvlc, "screensaver,none" ); - } +# endif #endif if( (config_GetInt( p_libvlc, "file-logging" ) > 0) && @@ -937,7 +928,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #ifdef HAVE_SYSLOG_H if( config_GetInt( p_libvlc, "syslog" ) > 0 ) { - char *logmode = var_CreateGetString( p_libvlc, "logmode" ); + char *logmode = var_CreateGetNonEmptyString( p_libvlc, "logmode" ); var_SetString( p_libvlc, "logmode", "syslog" ); intf_Create( p_libvlc, "logger,none" ); @@ -946,8 +937,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, var_SetString( p_libvlc, "logmode", logmode ); free( logmode ); } - else - var_Destroy( p_libvlc, "logmode" ); + var_Destroy( p_libvlc, "logmode" ); } #endif @@ -959,19 +949,19 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #ifdef WIN32 if( config_GetInt( p_libvlc, "prefer-system-codecs") > 0 ) { - char *psz_codecs = config_GetPsz( p_playlist, "codec" ); + char *psz_codecs = var_CreateGetNonEmptyString( p_playlist, "codec" ); if( psz_codecs ) { char *psz_morecodecs; if( asprintf(&psz_morecodecs, "%s,dmo,quicktime", psz_codecs) != -1 ) { - config_PutPsz( p_libvlc, "codec", psz_morecodecs); + var_SetString( p_libvlc, "codec", psz_morecodecs); free( psz_morecodecs ); } + free( psz_codecs ); } else - config_PutPsz( p_libvlc, "codec", "dmo,quicktime"); - free( psz_codecs ); + var_SetString( p_libvlc, "codec", "dmo,quicktime"); } #endif @@ -1000,8 +990,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Get --open argument */ - psz_val = var_CreateGetString( p_libvlc, "open" ); - if ( psz_val != NULL && *psz_val ) + psz_val = var_CreateGetNonEmptyString( 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, @@ -1062,7 +1052,7 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) if( b_daemon ) { - psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); + psz_pidfile = var_CreateGetNonEmptyString( p_libvlc, "pidfile" ); if( psz_pidfile != NULL ) { msg_Dbg( p_libvlc, "removing pid file %s", psz_pidfile ); @@ -1085,9 +1075,7 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) /* Free module bank. It is refcounted, so we call this each time */ module_EndBank( p_libvlc, true ); - var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action, - (void *)p_libvlc->p_hotkeys ); - free( (void *)p_libvlc->p_hotkeys ); + vlc_DeinitActions( p_libvlc ); } /** @@ -1114,7 +1102,6 @@ void libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) msg_Destroy( p_libvlc ); /* Destroy mutexes */ - vlc_cond_destroy( &priv->exiting ); vlc_mutex_destroy( &priv->timer_lock ); #ifndef NDEBUG /* Hack to dump leaked objects tree */ @@ -1137,8 +1124,8 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) if( !psz_module ) /* requesting the default interface */ { - char *psz_interface = config_GetPsz( p_libvlc, "intf" ); - if( !psz_interface || !*psz_interface ) /* "intf" has not been set */ + char *psz_interface = var_CreateGetNonEmptyString( p_libvlc, "intf" ); + if( !psz_interface ) /* "intf" has not been set */ { #ifndef WIN32 if( b_daemon ) @@ -1152,19 +1139,26 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) "Use 'cvlc' to use vlc without interface.") ); } free( psz_interface ); + var_Destroy( p_libvlc, "intf" ); } /* Try to create the interface */ - if( intf_Create( p_libvlc, psz_module ? psz_module : "$intf" ) ) - { + int ret = intf_Create( p_libvlc, psz_module ? psz_module : "$intf" ); + if( ret ) msg_Err( p_libvlc, "interface \"%s\" initialization failed", psz_module ? psz_module : "default" ); - return VLC_EGENERIC; - } - return VLC_SUCCESS; + 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 @@ -1172,11 +1166,9 @@ static vlc_mutex_t exit_lock = VLC_STATIC_MUTEX; */ void libvlc_InternalWait( libvlc_int_t *p_libvlc ) { - libvlc_priv_t *priv = libvlc_priv( p_libvlc ); - vlc_mutex_lock( &exit_lock ); while( vlc_object_alive( p_libvlc ) ) - vlc_cond_wait( &priv->exiting, &exit_lock ); + vlc_cond_wait( &exiting, &exit_lock ); vlc_mutex_unlock( &exit_lock ); } @@ -1186,11 +1178,9 @@ void libvlc_InternalWait( libvlc_int_t *p_libvlc ) */ void libvlc_Quit( libvlc_int_t *p_libvlc ) { - libvlc_priv_t *priv = libvlc_priv( p_libvlc ); - vlc_mutex_lock( &exit_lock ); vlc_object_kill( p_libvlc ); - vlc_cond_signal( &priv->exiting ); + vlc_cond_broadcast( &exiting ); vlc_mutex_unlock( &exit_lock ); } @@ -1236,7 +1226,7 @@ static inline int LoadMessages (void) #else char psz_path[1024]; if (snprintf (psz_path, sizeof (psz_path), "%s" DIR_SEP "%s", - config_GetDataDir(), "locale") + config_GetDataDirDefault(), "locale") >= (int)sizeof (psz_path)) return -1; @@ -1405,17 +1395,16 @@ static void print_help_section( module_config_t *p_item, bool b_color, bool b_de if( !p_item ) return; if( b_color ) { - utf8_fprintf( stdout, RED" %s:\n"GRAY, - p_item->psz_text ); + utf8_fprintf( stdout, RED" %s:\n"GRAY, _( p_item->psz_text ) ); if( b_description && p_item->psz_longtext ) utf8_fprintf( stdout, MAGENTA" %s\n"GRAY, - p_item->psz_longtext ); + _( p_item->psz_longtext ) ); } else { - utf8_fprintf( stdout, " %s:\n", p_item->psz_text ); + utf8_fprintf( stdout, " %s:\n", _( p_item->psz_text ) ); if( b_description && p_item->psz_longtext ) - utf8_fprintf( stdout, " %s\n", p_item->psz_longtext ); + utf8_fprintf( stdout, " %s\n", _( p_item->psz_longtext ) ); } } @@ -1555,17 +1544,18 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) { if( b_color ) utf8_fprintf( stdout, "\n " GREEN "%s" GRAY " (%s)\n", - p_parser->psz_longname, - p_parser->psz_object_name ); + _( p_parser->psz_longname ), + p_parser->psz_object_name ); else - utf8_fprintf( stdout, "\n %s\n", p_parser->psz_longname ); + utf8_fprintf( stdout, "\n %s\n", _( p_parser->psz_longname ) ); } if( p_parser->psz_help ) { if( b_color ) - utf8_fprintf( stdout, CYAN" %s\n"GRAY, p_parser->psz_help ); + utf8_fprintf( stdout, CYAN" %s\n"GRAY, + _( p_parser->psz_help ) ); else - utf8_fprintf( stdout, " %s\n", p_parser->psz_help ); + utf8_fprintf( stdout, " %s\n", _( p_parser->psz_help ) ); } /* Print module options */ @@ -1599,17 +1589,19 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) { if( b_color ) utf8_fprintf( stdout, GREEN "\n %s\n" GRAY, - p_item->psz_text ); + _( p_item->psz_text ) ); else - utf8_fprintf( stdout, "\n %s\n", p_item->psz_text ); + utf8_fprintf( stdout, "\n %s\n", + _( p_item->psz_text ) ); } if( b_description && p_item->psz_longtext ) { if( b_color ) utf8_fprintf( stdout, CYAN " %s\n" GRAY, - p_item->psz_longtext ); + _( p_item->psz_longtext ) ); else - utf8_fprintf( stdout, " %s\n", p_item->psz_longtext ); + utf8_fprintf( stdout, " %s\n", + _( p_item->psz_longtext ) ); } break; @@ -1673,7 +1665,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) if( i ) strcat( psz_buffer, ", " ); sprintf( psz_buffer + strlen(psz_buffer), "%i (%s)", p_item->pi_list[i], - p_item->ppsz_list_text[i] ); + _( p_item->ppsz_list_text[i] ) ); } psz_ket = "}"; } @@ -1753,7 +1745,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) psz_spaces[i] = ' '; /* We wrap the rest of the output */ - sprintf( psz_buffer, "%s%s", p_item->psz_text, psz_suf ); + sprintf( psz_buffer, "%s%s", _( p_item->psz_text ), + psz_suf ); b_description_hack = b_description; description: @@ -1845,7 +1838,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) if( b_description_hack && p_item->psz_longtext ) { - sprintf( psz_buffer, "%s%s", p_item->psz_longtext, psz_suf ); + sprintf( psz_buffer, "%s%s", _( p_item->psz_longtext ), + psz_suf ); b_description_hack = false; psz_spaces = psz_spaces_longtext; utf8_fprintf( stdout, "%s", psz_spaces ); @@ -1902,14 +1896,15 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) static void ListModules( libvlc_int_t *p_this, bool b_verbose ) { module_t *p_parser; - char psz_spaces[22]; bool b_color = config_GetInt( p_this, "color" ) > 0; - memset( psz_spaces, ' ', 22 ); - #ifdef WIN32 ShowConsole( true ); + b_color = false; // don't put color control codes in a .txt file +#else + if( !isatty( 1 ) ) + b_color = false; #endif /* List all modules */ @@ -1918,23 +1913,14 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) /* Enumerate each module */ for (size_t j = 0; (p_parser = list[j]) != NULL; j++) { - int i; - - /* Nasty hack, but right now I'm too tired to think about a nice - * solution */ - i = 22 - strlen( p_parser->psz_object_name ) - 1; - if( i < 0 ) i = 0; - psz_spaces[i] = 0; - if( b_color ) - utf8_fprintf( stdout, GREEN" %s%s "WHITE"%s\n"GRAY, + utf8_fprintf( stdout, GREEN" %-22s "WHITE"%s\n"GRAY, p_parser->psz_object_name, - psz_spaces, - p_parser->psz_longname ); + _( p_parser->psz_longname ) ); else - utf8_fprintf( stdout, " %s%s %s\n", + utf8_fprintf( stdout, " %-22s %s\n", p_parser->psz_object_name, - psz_spaces, p_parser->psz_longname ); + _( p_parser->psz_longname ) ); if( b_verbose ) { @@ -1964,8 +1950,6 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) p_parser->i_score ); } } - - psz_spaces[i] = ' '; } module_list_free (list);