minor syntax

diff --git a/src/libFLAC++/file_encoder.cpp b/src/libFLAC++/file_encoder.cpp
index 8074cd8..a3d6e57 100644 (file)
--- a/src/libFLAC++/file_encoder.cpp
+++ b/src/libFLAC++/file_encoder.cpp
@@ -105,7 +105,7 @@ namespace FLAC {
                        return (bool)::FLAC__file_encoder_set_blocksize(encoder_, value);
                }
 
-               bool File::set_apodization(const char *apodization)
+               bool File::set_apodization(const char *specification)
                {
                        FLAC__ASSERT(is_valid());
                        return (bool)::FLAC__file_encoder_set_apodization(encoder_, specification);

diff --git a/src/libFLAC++/seekable_stream_encoder.cpp b/src/libFLAC++/seekable_stream_encoder.cpp
index d08afc0..69e2f00 100644 (file)
--- a/src/libFLAC++/seekable_stream_encoder.cpp
+++ b/src/libFLAC++/seekable_stream_encoder.cpp
@@ -105,7 +105,7 @@ namespace FLAC {
                        return (bool)::FLAC__seekable_stream_encoder_set_blocksize(encoder_, value);
                }
 
-               bool SeekableStream::set_apodization(const char *apodization)
+               bool SeekableStream::set_apodization(const char *specification)
                {
                        FLAC__ASSERT(is_valid());
                        return (bool)::FLAC__seekable_stream_encoder_set_apodization(encoder_, specification);

diff --git a/src/libFLAC++/stream_encoder.cpp b/src/libFLAC++/stream_encoder.cpp
index 004558c..50efce7 100644 (file)
--- a/src/libFLAC++/stream_encoder.cpp
+++ b/src/libFLAC++/stream_encoder.cpp
@@ -106,7 +106,7 @@ namespace FLAC {
                        return (bool)::FLAC__stream_encoder_set_blocksize(encoder_, value);
                }
 
-               bool Stream::set_apodization(const char *apodization)
+               bool Stream::set_apodization(const char *specification)
                {
                        FLAC__ASSERT(is_valid());
                        return (bool)::FLAC__stream_encoder_set_apodization(encoder_, specification);

diff --git a/src/plugin_common/replaygain.c b/src/plugin_common/replaygain.c
index 88e9341..b9c83a4 100644 (file)
--- a/src/plugin_common/replaygain.c
+++ b/src/plugin_common/replaygain.c
@@ -28,10 +28,10 @@ void FLAC_plugin__replaygain_get_from_file(const char *filename,
                                            double *track_peak, FLAC__bool *track_peak_set,
                                            double *album_peak, FLAC__bool *album_peak_set)
 {
+       FLAC__Metadata_SimpleIterator *iterator = FLAC__metadata_simple_iterator_new();
+
        *track_gain_set = *album_gain_set = *track_peak_set = *album_peak_set = false;
 
-       /* Largely stolen from vorbiscomment.c and the other replaygain.c  */
-       FLAC__Metadata_SimpleIterator *iterator = FLAC__metadata_simple_iterator_new();
        if(0 != iterator) {
                if(FLAC__metadata_simple_iterator_init(iterator, filename, /*read_only=*/true, /*preserve_file_stats=*/true)) {
                        FLAC__bool got_vorbis_comments = false;