[vlc-commits] Win32: audio outputs compile fix

Rémi Denis-Courmont git at videolan.org
Thu Aug 4 17:45:02 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug  4 18:44:45 2011 +0300| [d71433891b3781f9d82f1094ae568f4578784a15] | committer: Rémi Denis-Courmont

Win32: audio outputs compile fix

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d71433891b3781f9d82f1094ae568f4578784a15
---

 modules/audio_output/directx.c |    6 +++---
 modules/audio_output/waveout.c |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index a373a71..5a506ba 100644
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -241,7 +241,7 @@ static int OpenAudio( vlc_object_t *p_this )
             return VLC_EGENERIC;
         }
 
-        aout_PacketInit( p_aout, &p_sys->packet, A52_FRAME_NB );
+        aout_PacketInit( p_aout, &p_aout->sys->packet, A52_FRAME_NB );
         aout_VolumeNoneInit( p_aout );
     }
     else
@@ -296,7 +296,7 @@ static int OpenAudio( vlc_object_t *p_this )
 
         /* Calculate the frame size in bytes */
         aout_FormatPrepare( &p_aout->format );
-        aout_PacketInit( p_aout, &p_sys->packet, FRAME_SIZE );
+        aout_PacketInit( p_aout, &p_aout->sys->packet, FRAME_SIZE );
         aout_VolumeSoftInit( p_aout );
     }
 
@@ -1044,7 +1044,7 @@ static void* DirectSoundThread( void *data )
     {
         DWORD l_read;
         int l_queued = 0, l_free_slots;
-        unsigned i_frame_siz = p_sys->packet.samples;
+        unsigned i_frame_siz = p_aout->sys->packet.samples;
         mtime_t mtime = mdate();
         int i;
 
diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 1cd427c..79f8e0a 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 */



More information about the vlc-commits mailing list