Commit e3c85036 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

- Don't put private system_* header in public

 - Remove useless system_VLCPath
parent 1af701c6
......@@ -1055,7 +1055,6 @@ VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
/*****************************************************************************
* Additional vlc stuff
*****************************************************************************/
#include "vlc_os_specific.h"
#include "vlc_messages.h"
#include "vlc_variables.h"
#include "vlc_objects.h"
......
/*****************************************************************************
* os_specific.h: OS specific features
*****************************************************************************
* Copyright (C) 2001 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Gildas Bazin <gbazin@netcourrier.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#if !defined( __LIBVLC__ )
#error You are not libvlc or one of its plugins. You cannot include this file
#endif
#ifndef _NEED_OS_SPECIFIC_H
# define _NEED_OS_SPECIFIC_H 1
#endif
#if defined( SYS_BEOS )
/* Nothing at the moment, create beos_specific.h when needed */
#elif defined( __APPLE__ )
/* Nothing at the moment, create darwin_specific.h when needed */
#elif defined( WIN32 ) || defined( UNDER_CE )
VLC_EXPORT( const char * , system_VLCPath, (void));
#else
# undef _NEED_OS_SPECIFIC_H
#endif
# ifdef __cplusplus
extern "C" {
# endif
/*****************************************************************************
* Prototypes
*****************************************************************************/
#ifdef _NEED_OS_SPECIFIC_H
void system_Init ( libvlc_int_t *, int *, const char *[] );
void system_Configure ( libvlc_int_t *, int *, const char *[] );
void system_End ( libvlc_int_t * );
#else
# define system_Init( a, b, c ) {}
# define system_Configure( a, b, c ) {}
# define system_End( a ) {}
#endif
# ifdef __cplusplus
}
# endif
......@@ -334,7 +334,7 @@ static void Init( intf_thread_t *p_intf )
#if !defined( WIN32 )
QString path = QString( QT4LOCALEDIR );
#else
QString path = QString( QString(system_VLCPath()) + DIR_SEP +
QString path = QString( QString(config_GetDataDir()) + DIR_SEP +
"locale" + DIR_SEP );
#endif
// files depending on locale
......
......@@ -67,7 +67,6 @@ HEADERS_include = \
../include/vlc_mtime.h \
../include/vlc_network.h \
../include/vlc_objects.h \
../include/vlc_os_specific.h \
../include/vlc_osd.h \
../include/vlc_pgpkey.h \
../include/vlc_playlist.h \
......
......@@ -75,8 +75,6 @@
# include <hal/libhal.h>
#endif
#include "vlc_os_specific.h"
#include <vlc_playlist.h>
#include <vlc_interface.h>
......
......@@ -31,6 +31,26 @@ extern const struct hotkey libvlc_hotkeys[];
extern const size_t libvlc_hotkeys_size;
/*
* OS-specific initialization
*/
void system_Init ( libvlc_int_t *, int *, const char *[] );
void system_Configure ( libvlc_int_t *, int *, const char *[] );
void system_End ( libvlc_int_t * );
#if defined( SYS_BEOS )
/* Nothing at the moment, create beos_specific.h when needed */
#elif defined( __APPLE__ )
/* Nothing at the moment, create darwin_specific.h when needed */
#elif defined( WIN32 ) || defined( UNDER_CE )
VLC_EXPORT( const char * , system_VLCPath, (void));
#else
# define system_Init( a, b, c ) (void)0
# define system_Configure( a, b, c ) (void)0
# define system_End( a ) (void)0
#endif
/*
* Threads subsystem
*/
......
......@@ -330,7 +330,6 @@ stream_vaControl
__str_format
__str_format_meta
str_format_time
system_VLCPath
tls_ClientCreate
tls_ClientDelete
ToLocale
......
......@@ -372,12 +372,3 @@ void system_End( libvlc_int_t *p_this )
WSACleanup();
}
/*****************************************************************************
* system_VLCPath
* **************************************************************************/
const char* system_VLCPath( void )
{
libvlc_global_data_t* libvlc_global = vlc_global();
return libvlc_global->psz_vlcpath;
}
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