summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik de Castro Lopo <erikd@mega-nerd.com>2019-08-08 18:20:14 +1000
committerErik de Castro Lopo <erikd@mega-nerd.com>2019-08-09 08:12:54 +1000
commita718a5ac2d16ac2b0f4122f93daa0b48626d905d (patch)
tree66cd0d45d1021003e8f598a204e97b23a39e6cf6
parentf85a2f44f6b1b38a802751558579e3a500e23143 (diff)
downloadflac-topic/get-decoder.tar.gz
libFLAC: Rename get_client_data_from_decoder functiontopic/get-decoder
This function was added after the 1.3.2 release, but the name was bad (missing "FLAC__" at the start) and the pointer returned should be 'const'. fixup
-rw-r--r--src/libFLAC/include/protected/stream_decoder.h6
-rw-r--r--src/libFLAC/stream_decoder.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libFLAC/include/protected/stream_decoder.h b/src/libFLAC/include/protected/stream_decoder.h
index f7e20021..99092751 100644
--- a/src/libFLAC/include/protected/stream_decoder.h
+++ b/src/libFLAC/include/protected/stream_decoder.h
@@ -53,13 +53,13 @@ typedef struct FLAC__StreamDecoderProtected {
} FLAC__StreamDecoderProtected;
/*
- * return the number of input bytes consumed
+ * Return the number of input bytes consumed
*/
uint32_t FLAC__stream_decoder_get_input_bytes_unconsumed(const FLAC__StreamDecoder *decoder);
/*
- * return client_data from decoder
+ * Return client_data from decoder. The data pointed to by the pointer should not be modified.
*/
-FLAC_API void *get_client_data_from_decoder(FLAC__StreamDecoder *decoder);
+FLAC_API const void *FLAC__get_decoder_client_data(FLAC__StreamDecoder *decoder);
#endif
diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c
index db1f3202..5b96086c 100644
--- a/src/libFLAC/stream_decoder.c
+++ b/src/libFLAC/stream_decoder.c
@@ -3398,7 +3398,7 @@ FLAC__bool file_eof_callback_(const FLAC__StreamDecoder *decoder, void *client_d
return feof(decoder->private_->file)? true : false;
}
-void *get_client_data_from_decoder(FLAC__StreamDecoder *decoder)
+FLAC_API const void *FLAC__get_decoder_client_data(FLAC__StreamDecoder *decoder)
{
return decoder->private_->client_data;
}