From beb128489bea1a8f1d2145218e8bed304f87dded Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Tue, 3 Oct 2006 01:04:41 +0000 Subject: [PATCH] minor comments --- include/FLAC/stream_decoder.h | 6 +----- include/FLAC/stream_encoder.h | 6 +----- src/libOggFLAC/ogg_encoder_aspect.c | 2 +- src/libOggFLAC/stream_encoder.c | 6 +++--- src/metaflac/operations.c | 4 ++-- 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/include/FLAC/stream_decoder.h b/include/FLAC/stream_decoder.h index 95947af..6762a69 100644 --- a/include/FLAC/stream_decoder.h +++ b/include/FLAC/stream_decoder.h @@ -55,11 +55,7 @@ extern "C" { * \ingroup flac * * \brief - * This module describes the two decoder layers provided by libFLAC. - * - * libFLAC provides two ways of decoding FLAC streams. There is a @@@@@@frame decoder which decodes single frames at a time, and a stream decoder which decodes whole streams. - * - * @@@@@@TODO frame decoder + * This module describes the decoder layers provided by libFLAC. * * The stream decoder can be used decode complete streams either from the * client via callbacks, or directly from a file, depending on how it is diff --git a/include/FLAC/stream_encoder.h b/include/FLAC/stream_encoder.h index 6ccd263..e57a683 100644 --- a/include/FLAC/stream_encoder.h +++ b/include/FLAC/stream_encoder.h @@ -56,11 +56,7 @@ extern "C" { * \ingroup flac * * \brief - * This module describes the two encoder layers provided by libFLAC. - * - * libFLAC provides two ways of encoding FLAC streams. There is a @@@@@@frame encoder which encodes single frames at a time, and a stream encoder which encodes whole streams. - * - * @@@@@@TODO frame encoder + * This module describes the encoder layers provided by libFLAC. * * The stream encoder can be used encode complete streams either to the * client via callbacks, or directly to a file, depending on how it is diff --git a/src/libOggFLAC/ogg_encoder_aspect.c b/src/libOggFLAC/ogg_encoder_aspect.c index 29796d3..9f7b25a 100644 --- a/src/libOggFLAC/ogg_encoder_aspect.c +++ b/src/libOggFLAC/ogg_encoder_aspect.c @@ -63,7 +63,7 @@ FLAC__bool OggFLAC__ogg_encoder_aspect_init(OggFLAC__OggEncoderAspect *aspect) void OggFLAC__ogg_encoder_aspect_finish(OggFLAC__OggEncoderAspect *aspect) { (void)ogg_stream_clear(&aspect->stream_state); - /*@@@ what aobut the page? */ + /*@@@ what about the page? */ } void OggFLAC__ogg_encoder_aspect_set_serial_number(OggFLAC__OggEncoderAspect *aspect, long value) diff --git a/src/libOggFLAC/stream_encoder.c b/src/libOggFLAC/stream_encoder.c index c5a7e7e..04a6d42 100644 --- a/src/libOggFLAC/stream_encoder.c +++ b/src/libOggFLAC/stream_encoder.c @@ -46,7 +46,7 @@ #include /* for memcpy() */ #include /* for off_t */ #if defined _MSC_VER || defined __MINGW32__ -/*@@@ [2G limit] hacks for MSVC6 */ +/*@@@@@@ [2G limit] hacks for MSVC6 */ #define fseeko fseek #define ftello ftell #endif @@ -1156,13 +1156,13 @@ FLAC__StreamEncoderWriteStatus file_write_callback_(const FLAC__StreamEncoder *s * will drop back to 0. */ encoder->private_->frames_written = max(encoder->private_->frames_written, current_frame+1); - /*@@@ We would like to add an '&& samples > 0' to the if + /* We would like to add an '&& samples > 0' to the if * clause here but currently because of the nature of our Ogg * writing implementation, 'samples' is always 0 (see * ogg_encoder_aspect.c). The downside is extra progress * callbacks. */ - if(0 != encoder->private_->progress_callback /*@@@ && samples > 0 */) + if(0 != encoder->private_->progress_callback /* && samples > 0 */) encoder->private_->progress_callback((FLAC__StreamEncoder*)encoder, encoder->private_->bytes_written, encoder->private_->samples_written, encoder->private_->frames_written, encoder->private_->total_frames_estimate, encoder->private_->client_data); return FLAC__STREAM_ENCODER_WRITE_STATUS_OK; } diff --git a/src/metaflac/operations.c b/src/metaflac/operations.c index e5e7523..de13383 100644 --- a/src/metaflac/operations.c +++ b/src/metaflac/operations.c @@ -100,7 +100,7 @@ FLAC__bool do_major_operation(const CommandLineOptions *options) unsigned i; FLAC__bool ok = true; - /*@@@ to die after first error, v--- add '&& ok' here */ + /* to die after first error, v--- add '&& ok' here */ for(i = 0; i < options->num_files; i++) ok &= do_major_operation_on_file(options->filenames[i], options); @@ -194,7 +194,7 @@ FLAC__bool do_major_operation__list(const char *filename, FLAC__Metadata_Chain * FLAC__bool do_major_operation__append(FLAC__Metadata_Chain *chain, const CommandLineOptions *options) { (void) chain, (void) options; - fprintf(stderr, "ERROR: --append not implemented yet\n"); /*@@@*/ + fprintf(stderr, "ERROR: --append not implemented yet\n"); return false; } -- 2.7.4