X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fwaveout.c;h=3d10416da3e1d8f67c1d4f8c9d7a0c3634a22dd3;hb=c72c363f0344ac9bfb280fd4c48299c862561eff;hp=1cd427c66016f65879672cbb1a1442df3d506e55;hpb=297aefb71296841cfda4c148d14c3af0b25d039d;p=vlc

diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 1cd427c660..3d10416da3 100644
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -240,7 +240,7 @@ static int Open( vlc_object_t *p_this )
         p_aout->sys->i_buffer_size =
             p_aout->format.i_bytes_per_frame;
 
-        aout_PacketInit( p_aout, &p_aout->p_sys->packet, A52_FRAME_NB );
+        aout_PacketInit( p_aout, &p_aout->sys->packet, A52_FRAME_NB );
         aout_VolumeNoneInit( p_aout );
     }
     else
@@ -286,7 +286,7 @@ static int Open( vlc_object_t *p_this )
         p_aout->sys->i_buffer_size = FRAME_SIZE *
             p_aout->format.i_bytes_per_frame;
 
-        aout_PacketInit( p_aout, &p_aout->p_sys->packet, FRAME_SIZE );
+        aout_PacketInit( p_aout, &p_aout->sys->packet, FRAME_SIZE );
         aout_VolumeSoftInit( p_aout );
 
         /* Check for hardware volume support */
@@ -311,6 +311,7 @@ static int Open( vlc_object_t *p_this )
         malloc( p_aout->sys->i_buffer_size );
     if( p_aout->sys->p_silence_buffer == NULL )
     {
+        aout_PacketDestroy( p_aout );
         free( p_aout->sys );
         return VLC_ENOMEM;
     }
@@ -436,7 +437,7 @@ static void Probe( audio_output_t * p_aout )
     }
 
     /* Test for SPDIF support */
-    if ( AOUT_FMT_NON_LINEAR( &p_aout->format ) )
+    if ( AOUT_FMT_SPDIF( &p_aout->format ) )
     {
         if( OpenWaveOut( p_aout,
                          p_aout->sys->i_wave_device_id,
@@ -897,7 +898,7 @@ static void* WaveOutThread( void *data )
     // than wait a short time... before grabbing first frames
     mwait( p_sys->start_date - AOUT_MAX_PTS_ADVANCE/4 );
 
-#define waveout_warn(msg) msg_Warn( p_aout, "aout_OutputNextBuffer no buffer "\
+#define waveout_warn(msg) msg_Warn( p_aout, "aout_PacketNext no buffer "\
                            "got next_date=%d ms, "\
                            "%d frames to play, %s",\
                            (int)(next_date/(mtime_t)1000), \
@@ -926,25 +927,19 @@ static void* WaveOutThread( void *data )
 
 
                 /* Take into account the latency */
-                p_buffer = aout_OutputNextBuffer( p_aout,
-                    next_date,
-                    b_sleek );
-
+                p_buffer = aout_PacketNext( p_aout, next_date );
                 if(!p_buffer)
                 {
 #if 0
-                    msg_Dbg( p_aout, "aout_OutputNextBuffer no buffer "
-                                      "got next_date=%d ms, "
-                                      "%d frames to play",
-                                      (int)(next_date/(mtime_t)1000),
-                                      i_queued_frames);
+                    msg_Dbg( p_aout, "aout_PacketNext no buffer got "
+                             "next_date=%"PRId64" ms, %d frames to play",
+                             next_date/1000, i_queued_frames);
 #endif
                     // means we are too early to request a new buffer?
                     waveout_warn("waiting...")
                     mwait( next_date - AOUT_MAX_PTS_ADVANCE/4 );
                     next_date = mdate();
-                    p_buffer = aout_OutputNextBuffer( p_aout, next_date,
-                                                      b_sleek );
+                    p_buffer = aout_PacketNext( p_aout, next_date );
                 }
 
                 if( !p_buffer && i_queued_frames )