Do not try to access other's filters

[vlc] / modules / audio_output / alsa.c

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index fc0090f7946ef9db9b1aadadee25e5fe487cb2c3..35df6846ce3384b991fece91f4e4d7e73fe38825 100644 (file)
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -33,10 +33,9 @@
 #include <errno.h>                                                 /* ENOMEM */
 #include <string.h>                                            /* strerror() */
 #include <stdlib.h>                            /* calloc(), malloc(), free() */
-#include <vlc/aout.h>
-#include <vlc_interaction.h>
+#include <vlc_interface.h>
 
-#include "aout_internal.h"
+#include <vlc_aout.h>
 
 /* ALSA part
    Note: we use the new API which is available since 0.9.0beta10a. */
@@ -358,7 +357,7 @@ static int Open( vlc_object_t *p_this )
 
     /* Choose the linear PCM format (read the comment above about FPU
        and float32) */
-    if( p_aout->p_libvlc->i_cpu & CPU_CAPABILITY_FPU )
+    if( vlc_CPU() & CPU_CAPABILITY_FPU )
     {
         i_vlc_pcm_format = VLC_FOURCC('f','l','3','2');
         i_snd_pcm_format = SND_PCM_FORMAT_FLOAT;
@@ -726,7 +725,7 @@ static void Close( vlc_object_t *p_this )
     vlc_cond_signal( &p_aout->output.p_sys->wait );
     vlc_mutex_unlock( &p_aout->output.p_sys->lock );
 
-    p_aout->b_die = VLC_TRUE;
+    vlc_object_kill( p_aout );
     vlc_thread_join( p_aout );
     p_aout->b_die = VLC_FALSE;
 
@@ -983,7 +982,6 @@ static void GetDevicesForCard(module_config_t *p_item, int i_card)
         p_item->i_list++;
         p_item->ppsz_list[ p_item->i_list ] = NULL;
         p_item->ppsz_list_text[ p_item->i_list ] = NULL;
-                
     }
 
     snd_ctl_close( p_ctl );