X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fdarwin_specific.c;h=810bd1b27ae175a7935d64dddd90eff13edf6154;hb=6dc4e2605312381b4e8dd5eb4d8463075037dce0;hp=7c6d129d4fd05e941ba25fc42a37507dff5f85ce;hpb=6da90a1716250d282f16dc6bc9dacec5b9514caf;p=vlc diff --git a/src/misc/darwin_specific.c b/src/misc/darwin_specific.c index 7c6d129d4f..810bd1b27a 100644 --- a/src/misc/darwin_specific.c +++ b/src/misc/darwin_specific.c @@ -1,7 +1,8 @@ + /***************************************************************************** * darwin_specific.m: Darwin specific features ***************************************************************************** - * Copyright (C) 2001-2007 the VideoLAN team + * Copyright (C) 2001-2009 the VideoLAN team * $Id$ * * Authors: Sam Hocevar @@ -27,50 +28,22 @@ # include "config.h" #endif -#include +#include #include "../libvlc.h" #include /* *dir() */ - +#include +#include #include +#include #ifdef HAVE_LOCALE_H # include #endif -#ifdef HAVE_MACH_O_DYLD_H -# include -#endif #ifndef MAXPATHLEN # define MAXPATHLEN 1024 #endif -/* CFLocaleCopyAvailableLocaleIdentifiers is present only on post-10.4 */ -extern CFArrayRef CFLocaleCopyAvailableLocaleIdentifiers(void) __attribute__((weak_import)); - -/* emulate CFLocaleCopyAvailableLocaleIdentifiers on pre-10.4 */ -static CFArrayRef copy_all_locale_indentifiers(void) -{ - CFMutableArrayRef available_locales; - DIR * dir; - struct dirent *file; - - dir = opendir( "/usr/share/locale" ); - available_locales = CFArrayCreateMutable( kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks ); - - while ( (file = readdir(dir)) ) - { - /* we should probably filter out garbage */ - /* we can't use CFStringCreateWithFileSystemRepresentation as it is - * supported only on post-10.4 (and this function is only for pre-10.4) */ - CFStringRef locale = CFStringCreateWithCString( kCFAllocatorDefault, file->d_name, kCFStringEncodingUTF8 ); - CFArrayAppendValue( available_locales, (void*)locale ); - CFRelease( locale ); - } - - closedir( dir ); - return available_locales; -} - /***************************************************************************** * system_Init: fill in program path & retrieve language *****************************************************************************/ @@ -84,7 +57,6 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) (void)pi_argc; /* Get the full program path and name */ - /* First try to see if we are linked to the framework */ for (i = 0; i < _dyld_image_count(); i++) { @@ -98,7 +70,7 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) p_char += 26; /* p_char += strlen(" VLCKit.framework/Versions/" ) */ while( *p_char != '\0' && *p_char != '/') p_char++; - + /* If the string ends with VLC then we've found a winner */ if ( !strcmp( p_char, "/VLCKit" ) ) { @@ -108,8 +80,26 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) else p_char = NULL; } + else + { + size_t len = strlen(psz_img_name); + /* Do we end by "VLC"? If so we are the legacy VLC.app that doesn't + * link to VLCKit. */ + if( !strcmp( psz_img_name + len - 3, "VLC") ) + { + p_char = strdup( psz_img_name ); + break; + } + } + } + if ( !p_char ) + { + /* We are not linked to the VLC.framework, let's use dladdr to figure + * libvlc path */ + Dl_info info; + if( dladdr(system_Init, &info) ) + p_char = strdup(dirname( info.dli_fname )); } - if( !p_char ) { char path[MAXPATHLEN+1]; @@ -123,7 +113,8 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) p_char = strdup( ppsz_argv[ 0 ] ); } - vlc_global()->psz_vlcpath = p_char; + free(psz_vlcpath); + psz_vlcpath = p_char; /* Remove trailing program name */ for( ; *p_char ; ) @@ -134,12 +125,12 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) *p_char = '\0'; p_oldchar = p_char; } - p_char++; } +#ifdef ENABLE_NLS /* Check if $LANG is set. */ - if ( (p_char = getenv("LANG")) == NULL ) + if( NULL == getenv("LANG") ) { /* Retrieve the preferred language as chosen in System Preferences.app @@ -149,10 +140,7 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) CFArrayRef all_locales, preferred_locales; char psz_locale[50]; - if( CFLocaleCopyAvailableLocaleIdentifiers ) - all_locales = CFLocaleCopyAvailableLocaleIdentifiers(); - else - all_locales = copy_all_locale_indentifiers(); + all_locales = CFLocaleCopyAvailableLocaleIdentifiers(); preferred_locales = CFBundleCopyLocalizationsForPreferences( all_locales, NULL ); @@ -168,18 +156,17 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) } CFRelease( all_locales ); } - - vlc_mutex_init( &vlc_global()->iconv_lock ); - vlc_global()->iconv_macosx = vlc_iconv_open( "UTF-8", "UTF-8-MAC" ); +#endif } /***************************************************************************** * system_Configure: check for system specific configuration options. *****************************************************************************/ -void system_Configure( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) +void system_Configure( libvlc_int_t *p_this, + int i_argc, const char *const ppsz_argv[] ) { (void)p_this; - (void)pi_argc; + (void)i_argc; (void)ppsz_argv; } @@ -189,10 +176,7 @@ void system_Configure( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv void system_End( libvlc_int_t *p_this ) { (void)p_this; - free( vlc_global()->psz_vlcpath ); - - if ( vlc_global()->iconv_macosx != (vlc_iconv_t)-1 ) - vlc_iconv_close( vlc_global()->iconv_macosx ); - vlc_mutex_destroy( &vlc_global()->iconv_lock ); + free( psz_vlcpath ); + psz_vlcpath = NULL; }