Changeset e3c8503697329380e68f9373c5fff99c2492c1a0
- Timestamp:
- 25/02/08 20:48:50
(9 months ago)
- Author:
- Rémi Denis-Courmont <rem@videolan.org>
- git-committer:
- Rémi Denis-Courmont <rem@videolan.org> 1203968930 +0000
- git-parent:
[1af701c676790a72281997f48158ad8f5398265f]
- git-author:
- Rémi Denis-Courmont <rem@videolan.org> 1203968930 +0000
- Message:
- Don't put private system_* header in public
- Remove useless system_VLCPath
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r897ac98 |
re3c8503 |
|
| 1056 | 1056 | * Additional vlc stuff |
|---|
| 1057 | 1057 | *****************************************************************************/ |
|---|
| 1058 | | #include "vlc_os_specific.h" |
|---|
| 1059 | 1058 | #include "vlc_messages.h" |
|---|
| 1060 | 1059 | #include "vlc_variables.h" |
|---|
| re5d0cd4 |
re3c8503 |
|
| 335 | 335 | QString path = QString( QT4LOCALEDIR ); |
|---|
| 336 | 336 | #else |
|---|
| 337 | | QString path = QString( QString(system_VLCPath()) + DIR_SEP + |
|---|
| | 337 | QString path = QString( QString(config_GetDataDir()) + DIR_SEP + |
|---|
| 338 | 338 | "locale" + DIR_SEP ); |
|---|
| 339 | 339 | #endif |
|---|
| rbfbec22 |
re3c8503 |
|
| 68 | 68 | ../include/vlc_network.h \ |
|---|
| 69 | 69 | ../include/vlc_objects.h \ |
|---|
| 70 | | ../include/vlc_os_specific.h \ |
|---|
| 71 | 70 | ../include/vlc_osd.h \ |
|---|
| 72 | 71 | ../include/vlc_pgpkey.h \ |
|---|
| r5fb9f95 |
re3c8503 |
|
| 75 | 75 | # include <hal/libhal.h> |
|---|
| 76 | 76 | #endif |
|---|
| 77 | | |
|---|
| 78 | | #include "vlc_os_specific.h" |
|---|
| 79 | 77 | |
|---|
| 80 | 78 | #include <vlc_playlist.h> |
|---|
| ra4bc2c0 |
re3c8503 |
|
| 30 | 30 | extern const struct hotkey libvlc_hotkeys[]; |
|---|
| 31 | 31 | extern const size_t libvlc_hotkeys_size; |
|---|
| | 32 | |
|---|
| | 33 | |
|---|
| | 34 | /* |
|---|
| | 35 | * OS-specific initialization |
|---|
| | 36 | */ |
|---|
| | 37 | void system_Init ( libvlc_int_t *, int *, const char *[] ); |
|---|
| | 38 | void system_Configure ( libvlc_int_t *, int *, const char *[] ); |
|---|
| | 39 | void system_End ( libvlc_int_t * ); |
|---|
| | 40 | |
|---|
| | 41 | #if defined( SYS_BEOS ) |
|---|
| | 42 | /* Nothing at the moment, create beos_specific.h when needed */ |
|---|
| | 43 | #elif defined( __APPLE__ ) |
|---|
| | 44 | /* Nothing at the moment, create darwin_specific.h when needed */ |
|---|
| | 45 | #elif defined( WIN32 ) || defined( UNDER_CE ) |
|---|
| | 46 | VLC_EXPORT( const char * , system_VLCPath, (void)); |
|---|
| | 47 | #else |
|---|
| | 48 | # define system_Init( a, b, c ) (void)0 |
|---|
| | 49 | # define system_Configure( a, b, c ) (void)0 |
|---|
| | 50 | # define system_End( a ) (void)0 |
|---|
| | 51 | #endif |
|---|
| 32 | 52 | |
|---|
| 33 | 53 | |
|---|
| rd92fffb |
re3c8503 |
|
| 331 | 331 | __str_format_meta |
|---|
| 332 | 332 | str_format_time |
|---|
| 333 | | system_VLCPath |
|---|
| 334 | 333 | tls_ClientCreate |
|---|
| 335 | 334 | tls_ClientDelete |
|---|
| r616b36c |
re3c8503 |
|
| 373 | 373 | WSACleanup(); |
|---|
| 374 | 374 | } |
|---|
| 375 | | |
|---|
| 376 | | /***************************************************************************** |
|---|
| 377 | | * system_VLCPath |
|---|
| 378 | | * **************************************************************************/ |
|---|
| 379 | | const char* system_VLCPath( void ) |
|---|
| 380 | | { |
|---|
| 381 | | libvlc_global_data_t* libvlc_global = vlc_global(); |
|---|
| 382 | | return libvlc_global->psz_vlcpath; |
|---|
| 383 | | } |
|---|