From 35e2dbab10c461728826367272b79c39a40c99de Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Wed, 7 Feb 2007 01:26:52 +0000 Subject: [PATCH] add return value (success/fail) to FLAC_plugin__replaygain_get_from_file() --- src/plugin_common/replaygain.c | 16 +++++++++------- src/plugin_common/replaygain.h | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/plugin_common/replaygain.c b/src/plugin_common/replaygain.c index 048a0ca..411330a 100644 --- a/src/plugin_common/replaygain.c +++ b/src/plugin_common/replaygain.c @@ -26,19 +26,21 @@ #include "FLAC/metadata.h" #include "share/grabbag.h" -void FLAC_plugin__replaygain_get_from_file(const char *filename, - double *reference, FLAC__bool *reference_set, - double *track_gain, FLAC__bool *track_gain_set, - double *album_gain, FLAC__bool *album_gain_set, - double *track_peak, FLAC__bool *track_peak_set, - double *album_peak, FLAC__bool *album_peak_set) +FLAC__bool FLAC_plugin__replaygain_get_from_file(const char *filename, + double *reference, FLAC__bool *reference_set, + double *track_gain, FLAC__bool *track_gain_set, + double *album_gain, FLAC__bool *album_gain_set, + 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(); + FLAC__bool ret = false; *track_gain_set = *album_gain_set = *track_peak_set = *album_peak_set = false; if(0 != iterator) { if(FLAC__metadata_simple_iterator_init(iterator, filename, /*read_only=*/true, /*preserve_file_stats=*/true)) { + ret = true; FLAC__bool got_vorbis_comments = false; do { if(FLAC__metadata_simple_iterator_get_block_type(iterator) == FLAC__METADATA_TYPE_VORBIS_COMMENT) { @@ -58,5 +60,5 @@ void FLAC_plugin__replaygain_get_from_file(const char *filename, } FLAC__metadata_simple_iterator_delete(iterator); } - return; + return ret; } diff --git a/src/plugin_common/replaygain.h b/src/plugin_common/replaygain.h index f3d1b0d..528312e 100644 --- a/src/plugin_common/replaygain.h +++ b/src/plugin_common/replaygain.h @@ -22,7 +22,7 @@ #include "FLAC/ordinals.h" -void FLAC_plugin__replaygain_get_from_file(const char *filename, +FLAC__bool FLAC_plugin__replaygain_get_from_file(const char *filename, double *reference, FLAC__bool *reference_set, double *track_gain, FLAC__bool *track_gain_set, double *album_gain, FLAC__bool *album_gain_set, -- 2.7.4