claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor comments

Browse Source
This commit is contained in:
Josh Coalson
2003-01-15 03:17:51 +00:00
parent d32b0dfb67
commit f0a8c4fc87
7 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/exe.mk
View File

@@ -51,8 +51,6 @@ release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -D
LFLAGS = -L$(LIBPATH) LFLAGS = -L$(LIBPATH)
#@@@ OBJS = $(SRCS_C:%.c=%.o) $(SRCS_CC:%.cc=%.o) $(SRCS_CPP:%.cpp=%.o) $(SRCS_NASM:%.nasm=%.o)
#@@@ OBJS = $(SRCS_C:%.c=%.$(BUILD).o) $(SRCS_CC:%.cc=%.$(BUILD).o) $(SRCS_CPP:%.cpp=%.$(BUILD).o) $(SRCS_NASM:%.nasm=%.$(BUILD).o)
DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o)
RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o)

2
build/lib.mk
View File

@@ -61,8 +61,6 @@ release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -D
LFLAGS = -L$(LIBPATH) LFLAGS = -L$(LIBPATH)
#@@@ OBJS = $(SRCS_C:%.c=%.o) $(SRCS_CC:%.cc=%.o) $(SRCS_CPP:%.cpp=%.o) $(SRCS_NASM:%.nasm=%.o)
#@@@ OBJS = $(SRCS_C:%.c=%.$(BUILD).o) $(SRCS_CC:%.cc=%.$(BUILD).o) $(SRCS_CPP:%.cpp=%.$(BUILD).o) $(SRCS_NASM:%.nasm=%.$(BUILD).o)
DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o)
RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o)

2
configure.in
View File

@@ -367,7 +367,7 @@ CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
CXXFLAGS="$OUR_CFLAGS_HEAD $CXXFLAGS" CXXFLAGS="$OUR_CFLAGS_HEAD $CXXFLAGS"
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AH_TEMPLATE(FLAC__ALIGN_MALLOC_DATA, [define if XXX]) AH_TEMPLATE(FLAC__ALIGN_MALLOC_DATA, [define to align allocated memory on 32-byte boundaries])
AH_TEMPLATE(FLAC__CPU_IA32, [define if building for ia32/i386]) AH_TEMPLATE(FLAC__CPU_IA32, [define if building for ia32/i386])
AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC])
AH_TEMPLATE(FLAC__CPU_SPARC, [define if building for SPARC]) AH_TEMPLATE(FLAC__CPU_SPARC, [define if building for SPARC])

4
doc/html/format.html
View File

@@ -746,7 +746,7 @@
<A HREF="#cuesheet_track"><I>CUESHEET_TRACK</I></A>+ <A HREF="#cuesheet_track"><I>CUESHEET_TRACK</I></A>+
</TD> </TD>
<TD> <TD>
One or more tracks. A CUESHEET block is required to have a lead-out track; it is always the last track in the CUESHEET. For CD-DA, the lead-out track number must be 170 as specified by the Red Book (? @@@@). One or more tracks. A CUESHEET block is required to have a lead-out track; it is always the last track in the CUESHEET. For CD-DA, the lead-out track number must be 170 as specified by the Red Book.
</TD> </TD>
</TR> </TR>
</TABLE> </TABLE>
@@ -774,7 +774,7 @@
&lt;8&gt; &lt;8&gt;
</TD> </TD>
<TD> <TD>
Track number. A track number of 0 is not allowed to avoid conflicting with the CD-DA spec, which reserves this for the lead-in. For CD-DA the number must be 1-99, or 170 for the lead-out (? @@@@). It is not required but encouraged to start with track 1 and increase sequentially. Track numbers must be unique within a CUESHEET. Track number. A track number of 0 is not allowed to avoid conflicting with the CD-DA spec, which reserves this for the lead-in. For CD-DA the number must be 1-99, or 170 for the lead-out. It is not required but encouraged to start with track 1 and increase sequentially. Track numbers must be unique within a CUESHEET.
</TD> </TD>
</TR> </TR>
<TR> <TR>

5
include/FLAC/format.h
View File

@@ -728,6 +728,7 @@ extern FLAC_API const unsigned FLAC__STREAM_METADATA_LENGTH_LEN; /**< == 24 (bit
* *
*****************************************************************************/ *****************************************************************************/
/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */
/** Tests that a sample rate is valid for FLAC. Since the rules for valid /** Tests that a sample rate is valid for FLAC. Since the rules for valid
* sample rates are slightly complex, they are encapsulated in this function. * sample rates are slightly complex, they are encapsulated in this function.
* *
@@ -738,6 +739,7 @@ extern FLAC_API const unsigned FLAC__STREAM_METADATA_LENGTH_LEN; /**< == 24 (bit
*/ */
FLAC_API FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate); FLAC_API FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate);
/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */
/** Check a seek table to see if it conforms to the FLAC specification. /** Check a seek table to see if it conforms to the FLAC specification.
* See the format specification for limits on the contents of the * See the format specification for limits on the contents of the
* seek table. * seek table.
@@ -750,6 +752,7 @@ FLAC_API FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate);
*/ */
FLAC_API FLAC__bool FLAC__format_seektable_is_legal(const FLAC__StreamMetadata_SeekTable *seek_table); FLAC_API FLAC__bool FLAC__format_seektable_is_legal(const FLAC__StreamMetadata_SeekTable *seek_table);
/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */
/** Sort a seek table's seek points according to the format specification. /** Sort a seek table's seek points according to the format specification.
* This includes a "unique-ification" step to remove duplicates, i.e. * This includes a "unique-ification" step to remove duplicates, i.e.
* seek points with identical \a sample_number values. Duplicate seek * seek points with identical \a sample_number values. Duplicate seek
@@ -764,7 +767,7 @@ FLAC_API FLAC__bool FLAC__format_seektable_is_legal(const FLAC__StreamMetadata_S
*/ */
FLAC_API unsigned FLAC__format_seektable_sort(FLAC__StreamMetadata_SeekTable *seek_table); FLAC_API unsigned FLAC__format_seektable_sort(FLAC__StreamMetadata_SeekTable *seek_table);
/* @@@@ add to unit tests */ /* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */
/** Check a cue sheet to see if it conforms to the FLAC specification. /** Check a cue sheet to see if it conforms to the FLAC specification.
* See the format specification for limits on the contents of the * See the format specification for limits on the contents of the
* cue sheet. * cue sheet.

10
src/libFLAC/metadata_iterators.c
View File

@@ -1395,7 +1395,7 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_streaminfo_(FILE *f
b = buffer; b = buffer;
/* @@@ we are using hardcoded numbers for simplicity but we should /* we are using hardcoded numbers for simplicity but we should
* probably eventually write a bit-level unpacker and use the * probably eventually write a bit-level unpacker and use the
* _STREAMINFO_ constants. * _STREAMINFO_ constants.
*/ */
@@ -1468,7 +1468,7 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_seektable_(FILE *fi
for(i = 0; i < block->num_points; i++) { for(i = 0; i < block->num_points; i++) {
if(fread(buffer, 1, FLAC__STREAM_METADATA_SEEKPOINT_LENGTH, file) != FLAC__STREAM_METADATA_SEEKPOINT_LENGTH) if(fread(buffer, 1, FLAC__STREAM_METADATA_SEEKPOINT_LENGTH, file) != FLAC__STREAM_METADATA_SEEKPOINT_LENGTH)
return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR; return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR;
/*@@@ some MAGIC NUMBERs here */ /* some MAGIC NUMBERs here */
block->points[i].sample_number = unpack_uint64_(buffer, 8); block->points[i].sample_number = unpack_uint64_(buffer, 8);
block->points[i].stream_offset = unpack_uint64_(buffer+8, 8); block->points[i].stream_offset = unpack_uint64_(buffer+8, 8);
block->points[i].frame_samples = unpack_uint32_(buffer+16, 2); block->points[i].frame_samples = unpack_uint32_(buffer+16, 2);
@@ -1731,7 +1731,7 @@ FLAC__Metadata_SimpleIteratorStatus write_metadata_block_data_streaminfo_(FILE *
FLAC__ASSERT(0 != file); FLAC__ASSERT(0 != file);
/* @@@ we are using hardcoded numbers for simplicity but we should /* we are using hardcoded numbers for simplicity but we should
* probably eventually write a bit-level packer and use the * probably eventually write a bit-level packer and use the
* _STREAMINFO_ constants. * _STREAMINFO_ constants.
*/ */
@@ -1800,7 +1800,7 @@ FLAC__Metadata_SimpleIteratorStatus write_metadata_block_data_seektable_(FILE *f
FLAC__ASSERT(0 != file); FLAC__ASSERT(0 != file);
for(i = 0; i < block->num_points; i++) { for(i = 0; i < block->num_points; i++) {
/*@@@ some MAGIC NUMBERs here */ /* some MAGIC NUMBERs here */
pack_uint64_(block->points[i].sample_number, buffer, 8); pack_uint64_(block->points[i].sample_number, buffer, 8);
pack_uint64_(block->points[i].stream_offset, buffer+8, 8); pack_uint64_(block->points[i].stream_offset, buffer+8, 8);
pack_uint32_(block->points[i].frame_samples, buffer+16, 2); pack_uint32_(block->points[i].frame_samples, buffer+16, 2);
@@ -2274,7 +2274,7 @@ FLAC__bool simple_iterator_copy_file_postfix_(FLAC__Metadata_SimpleIterator *ite
* if code == -1, it means the last block was deleted so * if code == -1, it means the last block was deleted so
* we have to set the is_last flag of the previous block * we have to set the is_last flag of the previous block
*/ */
/*@@@ MAGIC NUMBERs here; we know the is_last flag is the high bit of the byte at this location */ /* MAGIC NUMBERs here; we know the is_last flag is the high bit of the byte at this location */
FLAC__byte x; FLAC__byte x;
if(0 != fseek(*tempfile, fixup_is_last_flag_offset, SEEK_SET)) { if(0 != fseek(*tempfile, fixup_is_last_flag_offset, SEEK_SET)) {
cleanup_tempfile_(tempfile, tempfilename); cleanup_tempfile_(tempfile, tempfilename);

5
src/metaflac/main.c
View File

@@ -16,11 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/*@@@
more powerful operations yet to add:
add a seektable, using same args as flac
*/
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif