Commit 0b776c28 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

b_daemon does not need to be exported through vlc_global

parent 7f682030
...@@ -96,11 +96,13 @@ ...@@ -96,11 +96,13 @@
#include <vlc_vlm.h> #include <vlc_vlm.h>
/***************************************************************************** /*****************************************************************************
* The evil global variable. We handle it with care, don't worry. * The evil global variables. We handle them with care, don't worry.
*****************************************************************************/ *****************************************************************************/
static libvlc_int_t * p_static_vlc = NULL; static libvlc_int_t * p_static_vlc = NULL;
static volatile unsigned int i_instances = 0; static volatile unsigned int i_instances = 0;
static bool b_daemon = false;
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
...@@ -324,7 +326,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -324,7 +326,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" ); msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" );
b_exit = true; b_exit = true;
} }
p_libvlc_global->b_daemon = true; b_daemon = true;
/* lets check if we need to write the pidfile */ /* lets check if we need to write the pidfile */
psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
...@@ -371,7 +373,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -371,7 +373,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
close( STDOUT_FILENO ); close( STDOUT_FILENO );
close( STDERR_FILENO ); close( STDERR_FILENO );
p_libvlc_global->b_daemon = true; b_daemon = true;
} }
#endif #endif
} }
...@@ -1131,7 +1133,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, ...@@ -1131,7 +1133,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc,
} }
#ifndef WIN32 #ifndef WIN32
if( vlc_global()->b_daemon && b_block && !psz_module ) if( b_daemon && b_block && !psz_module )
{ {
/* Daemon mode hack. /* Daemon mode hack.
* We prefer the dummy interface if none is specified. */ * We prefer the dummy interface if none is specified. */
......
...@@ -120,9 +120,6 @@ struct libvlc_global_data_t ...@@ -120,9 +120,6 @@ struct libvlc_global_data_t
intf_thread_t *p_probe; ///< Devices prober intf_thread_t *p_probe; ///< Devices prober
/* Arch-specific variables */ /* Arch-specific variables */
#if !defined( WIN32 )
bool b_daemon;
#endif
#if defined( SYS_BEOS ) #if defined( SYS_BEOS )
vlc_object_t * p_appthread; vlc_object_t * p_appthread;
char * psz_vlcpath; char * 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