Fix live detection on win32

[vlc] / modules / audio_output / pulse.c

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 5043c6d101eafb76e45ff5757fa562b857130903..5d0c39daeb3766af1b944f6b1c911cd2c51c2773 100644 (file)
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -27,12 +27,15 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
 #include <vlc_aout.h>
 
 #include <pulse/pulseaudio.h>
 
+#include <assert.h>
+
 /*****************************************************************************
  * aout_sys_t: Pulseaudio output method descriptor
  *****************************************************************************
@@ -91,7 +94,7 @@ static void uninit(aout_instance_t *p_aout);
  *****************************************************************************/
 vlc_module_begin();
     set_shortname( "Pulse Audio" );
-    set_description( _("Pulseaudio audio output") );
+    set_description( N_("Pulseaudio audio output") );
     set_capability( "audio output", 40 );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AOUT );
@@ -115,14 +118,8 @@ static int Open ( vlc_object_t *p_this )
     /* Allocate structures */
     p_aout->output.p_sys = p_sys = malloc( sizeof( aout_sys_t ) );
     if( p_sys == NULL )
-    {
-        msg_Err( p_aout, "out of memory" );
         return VLC_ENOMEM;
-    }
-    p_sys->started = 0;
-    p_sys->stream = NULL;
-    p_sys->mainloop = NULL;
-    p_sys->context = NULL;
+    memset( p_sys, 0, sizeof( aout_sys_t ) );
 
     PULSE_DEBUG( "Pulse start initialization");
 
@@ -411,7 +408,7 @@ static void stream_request_cb(pa_stream *s, size_t length, void *userdata) {
                 latency = 0;
 
             }
-            PULSE_DEBUG( "Pulse stream request latency="I64Fd"", latency);
+            PULSE_DEBUG( "Pulse stream request latency=%"PRId64"", latency);
             next_date = mdate() + latency;