Changeset 0b776c28b4446eed12dcc984b07f5fcae06d4b6d
- Timestamp:
- 05/03/08 12:49:48
(4 months ago)
- Author:
- Rémi Denis-Courmont <rem@videolan.org>
- git-committer:
- Rémi Denis-Courmont <rem@videolan.org> 1209811788 +0300
- git-parent:
[7f682030017e1c075474ca18fba3ca1a1cb0a9d4]
- git-author:
- Rémi Denis-Courmont <rem@videolan.org> 1209811788 +0300
- Message:
b_daemon does not need to be exported through vlc_global
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rc07b1d0 |
r0b776c2 |
|
| 97 | 97 | |
|---|
| 98 | 98 | /***************************************************************************** |
|---|
| 99 | | * The evil global variable. We handle it with care, don't worry. |
|---|
| | 99 | * The evil global variables. We handle them with care, don't worry. |
|---|
| 100 | 100 | *****************************************************************************/ |
|---|
| 101 | 101 | static libvlc_int_t * p_static_vlc = NULL; |
|---|
| 102 | 102 | static volatile unsigned int i_instances = 0; |
|---|
| | 103 | |
|---|
| | 104 | static bool b_daemon = false; |
|---|
| 103 | 105 | |
|---|
| 104 | 106 | /***************************************************************************** |
|---|
| … | … | |
| 325 | 327 | b_exit = true; |
|---|
| 326 | 328 | } |
|---|
| 327 | | p_libvlc_global->b_daemon = true; |
|---|
| | 329 | b_daemon = true; |
|---|
| 328 | 330 | |
|---|
| 329 | 331 | /* lets check if we need to write the pidfile */ |
|---|
| … | … | |
| 372 | 374 | close( STDERR_FILENO ); |
|---|
| 373 | 375 | |
|---|
| 374 | | p_libvlc_global->b_daemon = true; |
|---|
| | 376 | b_daemon = true; |
|---|
| 375 | 377 | } |
|---|
| 376 | 378 | #endif |
|---|
| … | … | |
| 1132 | 1134 | |
|---|
| 1133 | 1135 | #ifndef WIN32 |
|---|
| 1134 | | if( vlc_global()->b_daemon && b_block && !psz_module ) |
|---|
| | 1136 | if( b_daemon && b_block && !psz_module ) |
|---|
| 1135 | 1137 | { |
|---|
| 1136 | 1138 | /* Daemon mode hack. |
|---|
| r0799868 |
r0b776c2 |
|
| 121 | 121 | |
|---|
| 122 | 122 | /* Arch-specific variables */ |
|---|
| 123 | | #if !defined( WIN32 ) |
|---|
| 124 | | bool b_daemon; |
|---|
| 125 | | #endif |
|---|
| 126 | 123 | #if defined( SYS_BEOS ) |
|---|
| 127 | 124 | vlc_object_t * p_appthread; |
|---|