From 492625088331a9c45aea1703856cbfc5d65f08c6 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Thu, 30 Dec 2004 03:48:42 +0000 Subject: [PATCH] minor comments --- doc/html/developers.html | 2 +- src/flac/decode.c | 2 +- src/flac/encode.c | 2 +- src/libFLAC/fixed.c | 2 +- src/libFLAC/seekable_stream_decoder.c | 2 +- src/share/grabbag/seektable.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/html/developers.html b/doc/html/developers.html index 4c73b87d..d1a8858d 100644 --- a/doc/html/developers.html +++ b/doc/html/developers.html @@ -104,7 +104,7 @@ JMF plugin.
  • - Streaming support in the plugins. + Streaming support in the Winamp plugin.

    • diff --git a/src/flac/decode.c b/src/flac/decode.c index 831e9401..e241dc2c 100644 --- a/src/flac/decode.c +++ b/src/flac/decode.c @@ -1183,7 +1183,7 @@ void print_stats(const DecoderSession *decoder_session) { if(flac__utils_verbosity_ >= 2) { #if defined _MSC_VER || defined __MINGW32__ - /* with VC++ you have to spoon feed it the casting */ + /* with MSVC you have to spoon feed it the casting */ const double progress = (double)(FLAC__int64)decoder_session->samples_processed / (double)(FLAC__int64)decoder_session->total_samples * 100.0; #else const double progress = (double)decoder_session->samples_processed / (double)decoder_session->total_samples * 100.0; diff --git a/src/flac/encode.c b/src/flac/encode.c index 975d66e7..8d1887c6 100644 --- a/src/flac/encode.c +++ b/src/flac/encode.c @@ -1866,7 +1866,7 @@ void print_stats(const EncoderSession *encoder_session) { const FLAC__uint64 samples_written = min(encoder_session->total_samples_to_encode, encoder_session->samples_written); #if defined _MSC_VER || defined __MINGW32__ - /* with VC++ you have to spoon feed it the casting */ + /* with MSVC you have to spoon feed it the casting */ const double progress = (double)(FLAC__int64)samples_written / (double)(FLAC__int64)encoder_session->total_samples_to_encode; const double ratio = (double)(FLAC__int64)encoder_session->bytes_written / ((double)(FLAC__int64)encoder_session->unencoded_size * min(1.0, progress)); #else diff --git a/src/libFLAC/fixed.c b/src/libFLAC/fixed.c index 1c46c331..6b132b89 100644 --- a/src/libFLAC/fixed.c +++ b/src/libFLAC/fixed.c @@ -320,7 +320,7 @@ unsigned FLAC__fixed_compute_best_predictor_wide(const FLAC__int32 data[], unsig FLAC__ASSERT(data_len > 0 || total_error_4 == 0); #ifndef FLAC__INTEGER_ONLY_LIBRARY #if defined _MSC_VER || defined __MINGW32__ - /* with VC++ you have to spoon feed it the casting */ + /* with MSVC you have to spoon feed it the casting */ residual_bits_per_sample[0] = (FLAC__float)((total_error_0 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_0 / (FLAC__double)data_len) / M_LN2 : 0.0); residual_bits_per_sample[1] = (FLAC__float)((total_error_1 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_1 / (FLAC__double)data_len) / M_LN2 : 0.0); residual_bits_per_sample[2] = (FLAC__float)((total_error_2 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_2 / (FLAC__double)data_len) / M_LN2 : 0.0); diff --git a/src/libFLAC/seekable_stream_decoder.c b/src/libFLAC/seekable_stream_decoder.c index 0f794290..c4115ba4 100644 --- a/src/libFLAC/seekable_stream_decoder.c +++ b/src/libFLAC/seekable_stream_decoder.c @@ -952,7 +952,7 @@ FLAC__bool seek_to_absolute_sample_(FLAC__SeekableStreamDecoder *decoder, FLAC__ const FLAC__uint64 range_bytes = (upper_bound>lower_bound? upper_bound - lower_bound - 1 : 0); #ifndef FLAC__INTEGER_ONLY_LIBRARY #if defined _MSC_VER || defined __MINGW32__ - /* with VC++ you have to spoon feed it the casting */ + /* with MSVC you have to spoon feed it the casting */ pos = (FLAC__int64)lower_bound + (FLAC__int64)(((FLAC__double)(FLAC__int64)target_offset / (FLAC__double)(FLAC__int64)range_samples) * (FLAC__double)(FLAC__int64)(range_bytes-1)) - approx_bytes_per_frame; #else pos = (FLAC__int64)lower_bound + (FLAC__int64)(((FLAC__double)target_offset / (FLAC__double)range_samples) * (FLAC__double)range_bytes) - approx_bytes_per_frame; diff --git a/src/share/grabbag/seektable.c b/src/share/grabbag/seektable.c index 1a72d715..a3082d10 100644 --- a/src/share/grabbag/seektable.c +++ b/src/share/grabbag/seektable.c @@ -61,7 +61,7 @@ FLAC__bool grabbag__seektable_convert_specification_to_template(const char *spec double sec = atof(pt); if(sec > 0.0) { #if defined _MSC_VER || defined __MINGW32__ - /* with VC++ you have to spoon feed it the casting */ + /* with MSVC you have to spoon feed it the casting */ unsigned n = (unsigned)((double)(FLAC__int64)total_samples_to_encode / (sec * (double)sample_rate)); #else unsigned n = (unsigned)((double)total_samples_to_encode / (sec * (double)sample_rate));