diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2010-06-27 18:59:54 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2010-06-27 18:59:54 +0000 |
commit | c6ced1c466be97e6c6159cd9d6c19ef58eeb76e9 (patch) | |
tree | 3bbed8de75168610af7815595f0566c6978732f8 | |
parent | 4c026f0c7f5ca6d02bf010fabe5123b9b39ddf47 (diff) | |
download | rockbox-c6ced1c466be97e6c6159cd9d6c19ef58eeb76e9.tar.gz rockbox-c6ced1c466be97e6c6159cd9d6c19ef58eeb76e9.zip |
Comment further unused code in libmad.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27160 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/codecs/libmad/SOURCES | 2 | ||||
-rw-r--r-- | apps/codecs/libmad/bit.c | 5 | ||||
-rw-r--r-- | apps/codecs/libmad/bit.h | 4 | ||||
-rw-r--r-- | apps/codecs/libmad/frame.c | 7 | ||||
-rw-r--r-- | apps/codecs/libmad/frame.h | 2 |
5 files changed, 15 insertions, 5 deletions
diff --git a/apps/codecs/libmad/SOURCES b/apps/codecs/libmad/SOURCES index a4ffcb5c64..b0a914fa2b 100644 --- a/apps/codecs/libmad/SOURCES +++ b/apps/codecs/libmad/SOURCES @@ -1,13 +1,11 @@ bit.c decoder.c -fixed.c frame.c huffman.c layer12.c layer3.c stream.c synth.c -timer.c version.c #if defined(CPU_COLDFIRE) imdct_mcf5249.S diff --git a/apps/codecs/libmad/bit.c b/apps/codecs/libmad/bit.c index 660c78d9f9..c08806d385 100644 --- a/apps/codecs/libmad/bit.c +++ b/apps/codecs/libmad/bit.c @@ -106,10 +106,13 @@ unsigned int mad_bit_length(struct mad_bitptr const *begin, return end->readbit - begin->readbit; } +/* rockbox: not used unsigned char mad_bit_bitsleft(struct mad_bitptr const *bitptr) { return 8 - (bitptr->readbit & 7); } +*/ + /* * NAME: bit->nextbyte() * DESCRIPTION: return pointer to next unprocessed byte @@ -152,7 +155,7 @@ uint32_t mad_bit_read(struct mad_bitptr *bitptr, unsigned int len) return 0; } -# if 0 +# if 0 /* rockbox: not used */ /* * NAME: bit->write() * DESCRIPTION: write an arbitrary number of bits diff --git a/apps/codecs/libmad/bit.h b/apps/codecs/libmad/bit.h index 985109f906..1c49522af5 100644 --- a/apps/codecs/libmad/bit.h +++ b/apps/codecs/libmad/bit.h @@ -34,12 +34,16 @@ void mad_bit_init(struct mad_bitptr *, unsigned char const *); unsigned int mad_bit_length(struct mad_bitptr const *, struct mad_bitptr const *); +/* rockbox: not used unsigned char mad_bit_bitsleft(struct mad_bitptr const *bitptr); +*/ unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *); void mad_bit_skip(struct mad_bitptr *, unsigned int); uint32_t mad_bit_read(struct mad_bitptr *, unsigned int); +/* rockbox: not used void mad_bit_write(struct mad_bitptr *, unsigned int, uint32_t); +*/ unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short); diff --git a/apps/codecs/libmad/frame.c b/apps/codecs/libmad/frame.c index f5e0cf8d32..0db5c5aa44 100644 --- a/apps/codecs/libmad/frame.c +++ b/apps/codecs/libmad/frame.c @@ -79,8 +79,9 @@ void mad_header_init(struct mad_header *header) header->flags = 0; header->private_bits = 0; - +/* rockbox: not used header->duration = mad_timer_zero; +*/ } /* @@ -374,9 +375,11 @@ int mad_header_decode(struct mad_header *header, struct mad_stream *stream) goto fail; /* calculate frame duration */ + /* rockbox: not used mad_timer_set(&header->duration, 0, 32 * MAD_NSBSAMPLES(header), header->samplerate); - + */ + /* calculate free bit rate */ if (header->bitrate == 0) { if ((stream->freerate == 0 || !stream->sync || diff --git a/apps/codecs/libmad/frame.h b/apps/codecs/libmad/frame.h index 2693b0b38b..f96a310089 100644 --- a/apps/codecs/libmad/frame.h +++ b/apps/codecs/libmad/frame.h @@ -61,7 +61,9 @@ struct mad_header { int flags; /* flags (see below) */ int private_bits; /* private bits (see below) */ +#if 0 /* rockbox: not used */ mad_timer_t duration; /* audio playing time of frame */ +#endif }; struct mad_frame { |