Use pl_Locked and pl_Unlocked.

[vlc] / modules / audio_output / portaudio.c

diff --git a/modules/audio_output/portaudio.c b/modules/audio_output/portaudio.c
index c7f14ffe3ad251c95f4917ffab0b196da44b35b6..0c19f297cb90b03756617b259d5db175d6ba23f2 100644 (file)
--- a/modules/audio_output/portaudio.c
+++ b/modules/audio_output/portaudio.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 
@@ -112,7 +112,7 @@ static int PAOpenStream( aout_instance_t * );
 
 vlc_module_begin();
     set_shortname( "PortAudio" );
-    set_description( _("PORTAUDIO audio output") );
+    set_description( N_("PORTAUDIO audio output") );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AOUT );
     add_integer( "portaudio-device", 0, NULL,
@@ -181,10 +181,7 @@ static int Open( vlc_object_t * p_this )
     /* Allocate p_sys structure */
     p_sys = (aout_sys_t *)malloc( sizeof(aout_sys_t) );
     if( p_sys == NULL )
-    {
-        msg_Err( p_aout, "out of memory" );
         return VLC_ENOMEM;
-    }
     p_sys->p_aout = p_aout;
     p_sys->p_stream = 0;
     p_aout->output.p_sys = p_sys;
@@ -581,7 +578,7 @@ static void PORTAUDIOThread( pa_thread_t *pa_thread )
     aout_sys_t *p_sys;
     int i_err;
 
-    while( !pa_thread->b_die )
+    while( vlc_object_alive (pa_thread) )
     {
         /* Wait for start of stream */
         vlc_mutex_lock( &pa_thread->lock_signal );