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

BeOS app thread: only used in one file

No need to clutter the root object with stuff that can be static.
parent 63b51e51
...@@ -121,7 +121,6 @@ struct libvlc_global_data_t ...@@ -121,7 +121,6 @@ struct libvlc_global_data_t
/* Arch-specific variables */ /* Arch-specific variables */
#if defined( SYS_BEOS ) #if defined( SYS_BEOS )
vlc_object_t * p_appthread;
char * psz_vlcpath; char * psz_vlcpath;
#elif defined( __APPLE__ ) #elif defined( __APPLE__ )
char * psz_vlcpath; char * psz_vlcpath;
......
...@@ -71,6 +71,8 @@ private: ...@@ -71,6 +71,8 @@ private:
#include "../../modules/gui/beos/MsgVals.h" #include "../../modules/gui/beos/MsgVals.h"
#define REALLY_QUIT 'requ' #define REALLY_QUIT 'requ'
static vlc_object_t *p_appthread;
extern "C" extern "C"
{ {
...@@ -84,11 +86,11 @@ static void AppThread( vlc_object_t *p_appthread ); ...@@ -84,11 +86,11 @@ static void AppThread( vlc_object_t *p_appthread );
*****************************************************************************/ *****************************************************************************/
void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] )
{ {
vlc_global()->p_appthread = p_appthread =
(vlc_object_t *)vlc_object_create( p_this, sizeof(vlc_object_t) ); (vlc_object_t *)vlc_object_create( p_this, sizeof(vlc_object_t) );
/* Create the BApplication thread and wait for initialization */ /* Create the BApplication thread and wait for initialization */
vlc_thread_create( vlc_global()->p_appthread, "app thread", AppThread, vlc_thread_create( p_appthread, "app thread", AppThread,
VLC_THREAD_PRIORITY_LOW, true ); VLC_THREAD_PRIORITY_LOW, true );
} }
...@@ -107,8 +109,8 @@ void system_End( libvlc_int_t *p_this ) ...@@ -107,8 +109,8 @@ void system_End( libvlc_int_t *p_this )
/* Tell the BApplication to die */ /* Tell the BApplication to die */
be_app->PostMessage( REALLY_QUIT ); be_app->PostMessage( REALLY_QUIT );
vlc_thread_join( vlc_global()->p_appthread ); vlc_thread_join( p_appthread );
vlc_object_release( vlc_global()->p_appthread ); vlc_object_release( p_appthread );
free( vlc_global()->psz_vlcpath ); free( vlc_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