BeOS app thread: only used in one file

No need to clutter the root object with stuff that can be static.

diff --git a/src/libvlc.h b/src/libvlc.h
index 5efccbe5171d4adc440b17d905c6e30e60380e56..3b25abb5727ebcd63fa139fae440fe4e723be65b 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -121,7 +121,6 @@ struct libvlc_global_data_t
 
     /* Arch-specific variables */
 #if defined( SYS_BEOS )
-    vlc_object_t *         p_appthread;
     char *                 psz_vlcpath;
 #elif defined( __APPLE__ )
     char *                 psz_vlcpath;

diff --git a/src/misc/beos_specific.cpp b/src/misc/beos_specific.cpp
index 9b7d5023a796eeda49720428ae4584bd9c6eaf63..91099ec15685f0fc076550c17d7dc30b39bd697d 100644 (file)
--- a/src/misc/beos_specific.cpp
+++ b/src/misc/beos_specific.cpp
@@ -71,6 +71,8 @@ private:
 #include "../../modules/gui/beos/MsgVals.h"
 #define REALLY_QUIT 'requ'
 
+static vlc_object_t *p_appthread;
+
 extern "C"
 {
 
@@ -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[] )
 {
-    vlc_global()->p_appthread =
+    p_appthread =
             (vlc_object_t *)vlc_object_create( p_this, sizeof(vlc_object_t) );
 
     /* 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 );
 }
 
@@ -107,8 +109,8 @@ void system_End( libvlc_int_t *p_this )
     /* Tell the BApplication to die */
     be_app->PostMessage( REALLY_QUIT );
 
-    vlc_thread_join( vlc_global()->p_appthread );
-    vlc_object_release( vlc_global()->p_appthread );
+    vlc_thread_join( p_appthread );
+    vlc_object_release( p_appthread );
 
     free( vlc_global()->psz_vlcpath );
 }