- Don't put private system_* header in public

 - Remove useless system_VLCPath

diff --git a/include/vlc_common.h b/include/vlc_common.h
index d2e0ffb960f9fb279201baad197f587e232f8057..5b0452707bb36319f521f8d327cc2145fcc7d7f8 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -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"

diff --git a/include/vlc_os_specific.h b/include/vlc_os_specific.h
deleted file mode 100644 (file)
index 342b23b..0000000
--- a/include/vlc_os_specific.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * 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

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 0bea6f491f5c9f3e68c264be839aa05c461cf475..1ed39a0657447b2a1e4c0b412c3e2850d6cf046e 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -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

diff --git a/src/Makefile.am b/src/Makefile.am
index dc497214dcfba73415cbe76c8f596a449ce2fe9c..25228248e4469cbfc4662231ee89a4262ed8ef34 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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 \

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 8466c8f6ee1155b1708c8418dba6cbbc3ee383d2..dcd676e70c6023cc9f854c58ba619cdf6f553e7d 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -75,8 +75,6 @@
 #   include <hal/libhal.h>
 #endif
 
-#include "vlc_os_specific.h"
-
 #include <vlc_playlist.h>
 #include <vlc_interface.h>
 

diff --git a/src/libvlc.h b/src/libvlc.h
index cbc7b1af0012b62edf14a5c74e1da91b24d02d94..f596b44881ad431af426a989a7a5bf411248878e 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.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
  */

diff --git a/src/libvlc.sym b/src/libvlc.sym
index ff6916a2546989c72d918fab926a36a90d74ee08..5dea64dd9994ef917d5c17bf129e6e5e51f39733 100644 (file)
--- a/src/libvlc.sym
+++ b/src/libvlc.sym
@@ -330,7 +330,6 @@ stream_vaControl
 __str_format
 __str_format_meta
 str_format_time
-system_VLCPath
 tls_ClientCreate
 tls_ClientDelete
 ToLocale

diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c
index 137ac397db21ad315f1da71d872b05737959aebf..dea9588d970cb0d2a49e7364dbcba4354f11710e 100644 (file)
--- a/src/misc/win32_specific.c
+++ b/src/misc/win32_specific.c
@@ -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;
-}