+
/*****************************************************************************
* darwin_specific.m: Darwin specific features
*****************************************************************************
#include <vlc_common.h>
#include "../libvlc.h"
#include <dirent.h> /* *dir() */
-
+#include <libgen.h>
+#include <dlfcn.h>
#include <CoreFoundation/CoreFoundation.h>
+#include <mach-o/dyld.h>
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
-#ifdef HAVE_MACH_O_DYLD_H
-# include <mach-o/dyld.h>
-#endif
#ifndef MAXPATHLEN
# define MAXPATHLEN 1024
(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++)
{
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" ) )
{
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];
p_char = strdup( ppsz_argv[ 0 ] );
}
+ free(psz_vlcpath);
psz_vlcpath = p_char;
/* Remove trailing program name */
*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
}
CFRelease( all_locales );
}
+#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;
}