diff --git a/build/exe.mk b/build/exe.mk index 987771b2..b905c8b7 100644 --- a/build/exe.mk +++ b/build/exe.mk @@ -51,8 +51,6 @@ release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -D 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) RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) diff --git a/build/lib.mk b/build/lib.mk index 7b8c2cfe..a4778d18 100644 --- a/build/lib.mk +++ b/build/lib.mk @@ -61,8 +61,6 @@ release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -D 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) RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) diff --git a/configure.in b/configure.in index 647a6f6c..42e8c03d 100644 --- a/configure.in +++ b/configure.in @@ -367,7 +367,7 @@ CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS" CXXFLAGS="$OUR_CFLAGS_HEAD $CXXFLAGS" 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_PPC, [define if building for PowerPC]) AH_TEMPLATE(FLAC__CPU_SPARC, [define if building for SPARC]) diff --git a/doc/html/format.html b/doc/html/format.html index 5d700c06..3c6361ed 100644 --- a/doc/html/format.html +++ b/doc/html/format.html @@ -746,7 +746,7 @@ CUESHEET_TRACK+ - 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. @@ -774,7 +774,7 @@ <8> - 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. diff --git a/include/FLAC/format.h b/include/FLAC/format.h index 52fec66d..cedb6c2b 100644 --- a/include/FLAC/format.h +++ b/include/FLAC/format.h @@ -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 * 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); +/* @@@@ 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. * See the format specification for limits on the contents of the * 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); +/* @@@@ 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. * This includes a "unique-ification" step to remove duplicates, i.e. * 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); -/* @@@@ 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. * See the format specification for limits on the contents of the * cue sheet. diff --git a/src/libFLAC/metadata_iterators.c b/src/libFLAC/metadata_iterators.c index 37913fad..048aa0ed 100644 --- a/src/libFLAC/metadata_iterators.c +++ b/src/libFLAC/metadata_iterators.c @@ -1395,7 +1395,7 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_streaminfo_(FILE *f 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 * _STREAMINFO_ constants. */ @@ -1468,7 +1468,7 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_seektable_(FILE *fi for(i = 0; i < block->num_points; i++) { if(fread(buffer, 1, FLAC__STREAM_METADATA_SEEKPOINT_LENGTH, file) != FLAC__STREAM_METADATA_SEEKPOINT_LENGTH) 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].stream_offset = unpack_uint64_(buffer+8, 8); 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); - /* @@@ 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 * _STREAMINFO_ constants. */ @@ -1800,7 +1800,7 @@ FLAC__Metadata_SimpleIteratorStatus write_metadata_block_data_seektable_(FILE *f FLAC__ASSERT(0 != file); 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].stream_offset, buffer+8, 8); 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 * 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; if(0 != fseek(*tempfile, fixup_is_last_flag_offset, SEEK_SET)) { cleanup_tempfile_(tempfile, tempfilename); diff --git a/src/metaflac/main.c b/src/metaflac/main.c index aa5635b3..64ff446b 100644 --- a/src/metaflac/main.c +++ b/src/metaflac/main.c @@ -16,11 +16,6 @@ * 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 # include #endif