Skip to content

V
vlc-2-2
Commit 0e93bc69 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ./src/misc/beos_specific.cpp, ./src/misc/darwin_specific.m: removed 

    the GetProgramPath call, stored the path in p_libvlc instead. Fixes
    compilation under anything other than OS X.
parent 4752aae0
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 60 deletions
include/beos_specific.h
View file @ 0e93bc69
......@@ -2,7 +2,7 @@
* beos_specific.h: BeOS specific features
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: beos_specific.h,v 1.7 2002/04/02 23:43:57 gbazin Exp $
* $Id: beos_specific.h,v 1.8 2003/01/19 03:16:24 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
*
......@@ -29,8 +29,6 @@
extern "C" {
#endif
char * system_GetProgramPath( void );
#ifdef __cplusplus
}
#endif
include/darwin_specific.h
View file @ 0e93bc69
......@@ -2,7 +2,7 @@
* darwin_specific.h: Darwin specific features
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: darwin_specific.h,v 1.6 2003/01/18 13:24:44 massiot Exp $
* $Id: darwin_specific.h,v 1.7 2003/01/19 03:16:24 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -21,7 +21,3 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/*****************************************************************************
* Prototypes
*****************************************************************************/
VLC_EXPORT( char *, system_GetProgramPath, ( void ) );
include/main.h
View file @ 0e93bc69
......@@ -3,7 +3,7 @@
* Declaration and extern access to global program object.
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
* $Id: main.h,v 1.51 2002/11/11 14:39:11 sam Exp $
* $Id: main.h,v 1.52 2003/01/19 03:16:24 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -57,6 +57,9 @@ struct libvlc_t
/* Arch-specific variables */
#if defined( SYS_BEOS )
vlc_object_t * p_appthread;
char * psz_vlcpath;
#elif defined( SYS_DARWIN )
char * psz_vlcpath;
#elif defined( WIN32 ) && !defined( UNDER_CE )
SIGNALOBJECTANDWAIT SignalObjectAndWait;
vlc_bool_t b_fast_mutex;
......
include/modules.h
View file @ 0e93bc69
......@@ -2,7 +2,7 @@
* modules.h : Module management functions.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.h,v 1.62 2002/11/11 14:39:11 sam Exp $
* $Id: modules.h,v 1.63 2003/01/19 03:16:24 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......
include/modules_inner.h
View file @ 0e93bc69
......@@ -2,7 +2,7 @@
* modules_inner.h : Macros used from within a module.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules_inner.h,v 1.36 2003/01/06 00:37:29 garf Exp $
* $Id: modules_inner.h,v 1.37 2003/01/19 03:16:24 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -114,15 +114,17 @@
} \
{ \
static module_config_t tmp = { CONFIG_HINT_END, NULL, NULL, '\0', \
NULL, NULL, NULL, 0, 0.0, 0, 0, 0.0, 0.0, NULL,NULL, NULL, VLC_FALSE }; \
NULL, NULL, NULL, 0, 0.0, 0, 0, \
0.0, 0.0, NULL,NULL, NULL, \
VLC_FALSE }; \
p_config[ i_config ] = tmp; \
} \
config_Duplicate( p_module, p_config ); \
if( p_module->p_config == NULL ) \
{ \
return -1; \
return VLC_EGENERIC; \
} \
return 0 && i_shortcut; \
return VLC_SUCCESS && i_shortcut; \
} \
struct _u_n_u_s_e_d_ /* the ; gets added */
......
modules/codec/spudec/spudec.c
View file @ 0e93bc69
......@@ -2,7 +2,7 @@
* spudec.c : SPU decoder thread
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: spudec.c,v 1.10 2003/01/18 13:24:44 massiot Exp $
* $Id: spudec.c,v 1.11 2003/01/19 03:16:24 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -128,7 +128,7 @@ static int RunDecoder( decoder_fifo_t * p_fifo )
#ifdef SYS_DARWIN
if ( (psz_font = config_GetPsz( p_fifo, "spudec-font" )) == NULL )
{
char * psz_vlcpath = system_GetProgramPath();
char * psz_vlcpath = p_fifo->p_libvlc->psz_vlcpath;
psz_font = malloc( strlen(psz_vlcpath) + strlen("/share/")
+ strlen(DEFAULT_FONT) + 1 );
sprintf(psz_font, "%s/share/" DEFAULT_FONT, psz_vlcpath);
......
src/libvlc.c
View file @ 0e93bc69
......@@ -2,7 +2,7 @@
* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.c,v 1.56 2003/01/07 13:26:22 sam Exp $
* $Id: libvlc.c,v 1.57 2003/01/19 03:16:24 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -961,7 +961,6 @@ static void SetLanguage ( char const *psz_lang )
char * psz_path;
#ifdef SYS_DARWIN
char * psz_vlcpath = system_GetProgramPath();
char psz_tmp[1024];
#endif
......@@ -988,7 +987,7 @@ static void SetLanguage ( char const *psz_lang )
#ifndef SYS_DARWIN
psz_path = LOCALEDIR;
#else
snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", psz_vlcpath,
snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc.psz_vlcpath,
"locale" );
psz_path = psz_tmp;
#endif
......
src/misc/beos_specific.cpp
View file @ 0e93bc69
......@@ -2,7 +2,7 @@
* beos_init.cpp: Initialization for BeOS specific features
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: beos_specific.cpp,v 1.28 2003/01/12 02:08:39 titer Exp $
* $Id: beos_specific.cpp,v 1.29 2003/01/19 03:16:24 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
*
......@@ -60,7 +60,6 @@ private:
/*****************************************************************************
* Static vars
*****************************************************************************/
static char * psz_program_path;
//const uint32 INTERFACE_CREATED = 'ifcr'; /* message sent from interface */
#include "../../modules/gui/beos/MsgVals.h"
......@@ -105,15 +104,7 @@ void system_End( vlc_t *p_this )
vlc_thread_join( p_this->p_libvlc->p_appthread );
vlc_object_destroy( p_this->p_libvlc->p_appthread );
free( psz_program_path );
}
/*****************************************************************************
* system_GetProgramPath: get the full path to the program.
*****************************************************************************/
char * system_GetProgramPath( void )
{
return( psz_program_path );
free( p_this->p_libvlc->psz_vlcpath );
}
/* following functions are local */
......@@ -178,7 +169,7 @@ void VlcApplication::ReadyToRun( )
BEntry entry( &info.ref );
entry.GetPath( &path );
path.GetParent( &path );
psz_program_path = strdup( path.Path() );
p_this->p_libvlc->psz_vlcpath = strdup( path.Path() );
/* Tell the main thread we are finished initializing the BApplication */
vlc_thread_ready( p_this );
......
src/misc/darwin_specific.m
View file @ 0e93bc69
......@@ -2,7 +2,7 @@
* darwin_specific.m: Darwin specific features
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: darwin_specific.m,v 1.6 2003/01/16 14:40:04 massiot Exp $
* $Id: darwin_specific.m,v 1.7 2003/01/19 03:16:24 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -28,11 +28,6 @@
#include <Cocoa/Cocoa.h>
/*****************************************************************************
* Static vars
*****************************************************************************/
static char * psz_program_path;
/*****************************************************************************
* system_Init: fill in program path & retrieve language
*****************************************************************************/
......@@ -100,7 +95,7 @@ void system_Init( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] )
char *p_char, *p_oldchar = &i_dummy;
/* Get the full program path and name */
p_char = psz_program_path = strdup( ppsz_argv[ 0 ] );
p_char = p_this->p_libvlc->psz_vlcpath = strdup( ppsz_argv[ 0 ] );
/* Remove trailing program name */
for( ; *p_char ; )
......@@ -157,14 +152,6 @@ void system_Configure( vlc_t *p_this )
*****************************************************************************/
void system_End( vlc_t *p_this )
{
free( psz_program_path );
}
/*****************************************************************************
* system_GetProgramPath: get the full path to the program.
*****************************************************************************/
char * system_GetProgramPath( void )
{
return( psz_program_path );
free( p_this->p_libvlc->psz_vlcpath );
}
src/misc/modules.c
View file @ 0e93bc69
......@@ -2,7 +2,7 @@
* modules.c : Builtin and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.c,v 1.109 2003/01/02 23:50:55 massiot Exp $
* $Id: modules.c,v 1.110 2003/01/19 03:16:24 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
......@@ -552,8 +552,7 @@ static void AllocateAllPlugins( vlc_object_t *p_this )
char ** ppsz_path = path;
char * psz_fullpath;
#if defined( SYS_BEOS ) || defined( SYS_DARWIN )
char * psz_vlcpath = system_GetProgramPath();
int i_vlclen = strlen( psz_vlcpath );
int i_vlclen = strlen( p_this->p_libvlc->psz_vlcpath );
vlc_bool_t b_notinroot;
#endif
......@@ -584,7 +583,8 @@ static void AllocateAllPlugins( vlc_object_t *p_this )
{
continue;
}
sprintf( psz_fullpath, "%s/%s", psz_vlcpath, *ppsz_path );
sprintf( psz_fullpath, "%s/%s",
p_this->p_libvlc->psz_vlcpath, *ppsz_path );
}
else
#endif
......
src/misc/win32_specific.c
View file @ 0e93bc69
......@@ -2,7 +2,7 @@
* win32_specific.c: Win32 specific features
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: win32_specific.c,v 1.19 2002/11/10 18:04:24 sam Exp $
* $Id: win32_specific.c,v 1.20 2003/01/19 03:16:24 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Gildas Bazin <gbazin@netcourrier.com>
......
src/video_output/video_text.c
View file @ 0e93bc69
......@@ -2,7 +2,7 @@
* video_text.c : text manipulation functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: video_text.c,v 1.41 2002/12/06 10:10:40 sam Exp $
* $Id: video_text.c,v 1.42 2003/01/19 03:16:24 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -222,7 +222,7 @@ vout_font_t *vout_LoadFont( vout_thread_t *p_vout, const char *psz_name )
char ** ppsz_path = path;
char * psz_file;
#if defined( SYS_BEOS ) || defined( SYS_DARWIN )
char * psz_vlcpath = system_GetProgramPath();
char * psz_vlcpath = p_this->p_libvlc->psz_vlcpath;
int i_vlclen = strlen( psz_vlcpath );
#endif
int i_char, i_line; /* character and line indexes */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment