Change error reporting on memory error to be memory error.

[vlc] / modules / access / cdda.c

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index a7c2d6307ca7fea9ad7827027e7d2ff79068ec94..b5d58cd3995087f011862dcbbb339dd4a689cf33 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -2,7 +2,7 @@
  * cdda.c : CD digital audio input module for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2003 VideoLAN
- * $Id: cdda.c,v 1.13 2004/02/05 22:56:12 gbazin Exp $
+ * $Id: cdda.c,v 1.15 2004/02/14 17:25:39 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -30,25 +30,9 @@
 #include <vlc/vlc.h>
 #include <vlc/input.h>
 
+#include "codecs.h"
 #include "vcd/cdrom.h"
 
-typedef struct WAVEHEADER
-{
-    uint32_t MainChunkID;                      // it will be 'RIFF'
-    uint32_t Length;
-    uint32_t ChunkTypeID;                      // it will be 'WAVE'
-    uint32_t SubChunkID;                       // it will be 'fmt '
-    uint32_t SubChunkLength;
-    uint16_t Format;
-    uint16_t Modus;
-    uint32_t SampleFreq;
-    uint32_t BytesPerSec;
-    uint16_t BytesPerSample;
-    uint16_t BitsPerSample;
-    uint32_t DataChunkID;                      // it will be 'data'
-    uint32_t DataLength;
-} WAVEHEADER;
-
 /*****************************************************************************
  * Module descriptior
  *****************************************************************************/
@@ -236,19 +220,19 @@ static int AccessOpen( vlc_object_t *p_this )
 
     /* Build a WAV header for the output data */
     memset( &p_sys->waveheader, 0, sizeof(WAVEHEADER) );
-    p_sys->waveheader.Format = 1 /*WAVE_FORMAT_PCM*/;
-    p_sys->waveheader.BitsPerSample = 16;
+    SetWLE( &p_sys->waveheader.Format, 1 ); /*WAVE_FORMAT_PCM*/
+    SetWLE( &p_sys->waveheader.BitsPerSample, 16);
     p_sys->waveheader.MainChunkID = VLC_FOURCC('R', 'I', 'F', 'F');
     p_sys->waveheader.Length = 0;                     /* we just don't know */
     p_sys->waveheader.ChunkTypeID = VLC_FOURCC('W', 'A', 'V', 'E');
     p_sys->waveheader.SubChunkID = VLC_FOURCC('f', 'm', 't', ' ');
-    p_sys->waveheader.SubChunkLength = 16;
-    p_sys->waveheader.Modus = 2;
-    p_sys->waveheader.SampleFreq = 44100;
-    p_sys->waveheader.BytesPerSample =
-        p_sys->waveheader.Modus * p_sys->waveheader.BitsPerSample / 8;
-    p_sys->waveheader.BytesPerSec =
-        p_sys->waveheader.BytesPerSample * p_sys->waveheader.SampleFreq;
+    SetDWLE( &p_sys->waveheader.SubChunkLength, 16);
+    SetWLE( &p_sys->waveheader.Modus, 2);
+    SetDWLE( &p_sys->waveheader.SampleFreq, 44100);
+    SetWLE( &p_sys->waveheader.BytesPerSample,
+            2 /*Modus*/ * 16 /*BitsPerSample*/ / 8 );
+    SetDWLE( &p_sys->waveheader.BytesPerSec,
+             16 /*BytesPerSample*/ * 44100 /*SampleFreq*/ );
     p_sys->waveheader.DataChunkID = VLC_FOURCC('d', 'a', 't', 'a');
     p_sys->waveheader.DataLength = 0;                 /* we just don't know */
     p_sys->i_header_pos = 0;
@@ -287,6 +271,7 @@ static int Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
         i_blocks = (i_len - sizeof(WAVEHEADER)) / CDDA_DATA_SIZE;
         memcpy( p_buffer, &p_sys->waveheader, sizeof(WAVEHEADER) );
         p_buffer += sizeof(WAVEHEADER);
+        i_read += sizeof(WAVEHEADER);
     }
 
     if( ioctl_ReadSectors( VLC_OBJECT(p_input), p_sys->vcddev, p_sys->i_sector,