From 0061679f0b8f7d9ab59525279cd4aa143a55d9b4 Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Sat, 14 Feb 2004 17:25:39 +0000 Subject: [PATCH] * modules/access/cdda*: removed definition of WAVEHEADER. * modules/access/cdda.c: small bug fix. --- modules/access/cdda.c | 21 +++------------------ modules/access/cdda/cdda.h | 22 +--------------------- 2 files changed, 4 insertions(+), 39 deletions(-) diff --git a/modules/access/cdda.c b/modules/access/cdda.c index 2cc5852243..b5d58cd399 100644 --- 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.14 2004/02/06 18:15:44 gbazin Exp $ + * $Id: cdda.c,v 1.15 2004/02/14 17:25:39 gbazin Exp $ * * Authors: Laurent Aimar * Gildas Bazin @@ -30,25 +30,9 @@ #include #include +#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 *****************************************************************************/ @@ -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, diff --git a/modules/access/cdda/cdda.h b/modules/access/cdda/cdda.h index ea5e1c6d96..e0eeffd515 100644 --- a/modules/access/cdda/cdda.h +++ b/modules/access/cdda/cdda.h @@ -3,7 +3,7 @@ * using libcdio, libvcd and libvcdinfo ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: cdda.h,v 1.5 2004/02/11 18:08:05 gbazin Exp $ + * $Id: cdda.h,v 1.6 2004/02/14 17:25:39 gbazin Exp $ * * Author: Rocky Bernstein * @@ -50,26 +50,6 @@ #define dbg_print(mask, s, args...) #endif -/***************************************************************************** - * Wave header structure definition - *****************************************************************************/ -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; - /***************************************************************************** * cdda_data_t: CD audio information *****************************************************************************/ -- 2.39.5