diff --git a/modules/gui/beos/AudioOutput.cpp b/modules/gui/beos/AudioOutput.cpp
index 93d6f317dd348414c41bd076f53470cd1e90605d..e61e26f2c87461c98856b4b582d34a9e709de9be 100644
--- a/modules/gui/beos/AudioOutput.cpp
+++ b/modules/gui/beos/AudioOutput.cpp
@@ -2,7 +2,7 @@
  * aout.cpp: BeOS audio output
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: AudioOutput.cpp,v 1.8 2002/09/18 21:21:23 massiot Exp $
+ * $Id: AudioOutput.cpp,v 1.9 2002/10/09 01:14:18 titer Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -126,19 +126,19 @@ static int SetFormat( aout_instance_t *p_aout )
     
     switch (p_aout->output.output.i_format)
     {
-    case AOUT_FMT_S16_LE:
+    case VLC_FOURCC('s','1','6','l'):
         p_aout->output.p_sys->p_format->format = gs_audio_format::B_GS_S16;
         p_aout->output.p_sys->p_format->byte_order = B_MEDIA_LITTLE_ENDIAN;
         break;
-    case AOUT_FMT_S16_BE:
+    case VLC_FOURCC('s','1','6','b'):
         p_aout->output.p_sys->p_format->format = gs_audio_format::B_GS_S16;
         p_aout->output.p_sys->p_format->byte_order = B_MEDIA_BIG_ENDIAN;
         break;
-    case AOUT_FMT_S8:
+    case VLC_FOURCC('s','8',0,0):
         p_aout->output.p_sys->p_format->format = gs_audio_format::B_GS_U8;
         p_aout->output.p_sys->p_format->byte_order = B_MEDIA_LITTLE_ENDIAN;
         break;
-    case AOUT_FMT_FLOAT32:
+    case VLC_FOURCC('f','1','3','2'):
         p_aout->output.p_sys->p_format->format = gs_audio_format::B_GS_F;
         p_aout->output.p_sys->p_format->byte_order = B_MEDIA_LITTLE_ENDIAN;
         break;
diff --git a/src/misc/beos_specific.cpp b/src/misc/beos_specific.cpp
index 21a2d5c0381b51268d620fa3d028e3f96b3f39a0..dab984350afa3587017e9c9b499c517308f1794a 100644
--- a/src/misc/beos_specific.cpp
+++ b/src/misc/beos_specific.cpp
@@ -2,7 +2,7 @@
  * beos_init.cpp: Initialization for BeOS specific features 
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: beos_specific.cpp,v 1.26 2002/09/30 18:30:28 titer Exp $
+ * $Id: beos_specific.cpp,v 1.27 2002/10/09 01:14:18 titer Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *
@@ -78,11 +78,11 @@ static void AppThread( vlc_object_t *p_appthread );
  *****************************************************************************/
 void system_Init( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] )
 {
-    p_this->p_vlc->p_appthread =
+    p_this->p_libvlc->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( p_this->p_vlc->p_appthread, "app thread", AppThread,
+    vlc_thread_create( p_this->p_libvlc->p_appthread, "app thread", AppThread,
                        VLC_THREAD_PRIORITY_LOW, VLC_TRUE );
 }
 
@@ -102,8 +102,8 @@ void system_End( vlc_t *p_this )
     /* Tell the BApplication to die */
     be_app->PostMessage( B_QUIT_REQUESTED );
 
-    vlc_thread_join( p_this->p_vlc->p_appthread );
-    vlc_object_destroy( p_this->p_vlc->p_appthread );
+    vlc_thread_join( p_this->p_libvlc->p_appthread );
+    vlc_object_destroy( p_this->p_libvlc->p_appthread );
 
     free( psz_program_path );
 }