HAVE_FPU: make constant

[vlc] / modules / audio_output / alsa.c

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index a1d770dd3ffb681c02522b0c2d4ce7d04c086f6a..c479d3ace981f6c5fd03c9d13cddf510e9d77051 100644 (file)
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -38,6 +38,7 @@
 #include <vlc_dialog.h>
 
 #include <vlc_aout.h>
+#include <vlc_cpu.h>
 
 /* ALSA part
    Note: we use the new API which is available since 0.9.0beta10a. */
@@ -358,7 +359,7 @@ static int Open( vlc_object_t *p_this )
 
     /* Choose the linear PCM format (read the comment above about FPU
        and float32) */
-    if( vlc_CPU() & CPU_CAPABILITY_FPU )
+    if( HAVE_FPU )
     {
         i_vlc_pcm_format = VLC_CODEC_FL32;
         i_snd_pcm_format = SND_PCM_FORMAT_FLOAT;
@@ -690,11 +691,11 @@ static void Play( aout_instance_t *p_aout )
         p_aout->output.p_sys->b_playing = true;
 
         /* get the playing date of the first aout buffer */
+        vlc_mutex_lock( &p_aout->output.p_sys->lock );
         p_aout->output.p_sys->start_date =
             aout_FifoFirstDate( p_aout, &p_aout->output.fifo );
 
         /* wake up the audio output thread */
-        vlc_mutex_lock( &p_aout->output.p_sys->lock );
         vlc_cond_signal( &p_aout->output.p_sys->wait );
         vlc_mutex_unlock( &p_aout->output.p_sys->lock );
     }