From 2e3527f8a4548643674aa0bc1d1f04f1093ac625 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Tue, 4 Jun 2002 05:47:33 +0000 Subject: [PATCH] add inherited get methods from stream decoder --- include/FLAC/file_decoder.h | 10 ++++++++++ include/FLAC/seekable_stream_decoder.h | 20 ++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/include/FLAC/file_decoder.h b/include/FLAC/file_decoder.h index c1f5c8d4..2771948d 100644 --- a/include/FLAC/file_decoder.h +++ b/include/FLAC/file_decoder.h @@ -118,6 +118,16 @@ FLAC__bool FLAC__file_decoder_set_metadata_ignore_all(FLAC__FileDecoder *decoder */ FLAC__FileDecoderState FLAC__file_decoder_get_state(const FLAC__FileDecoder *decoder); FLAC__bool FLAC__file_decoder_get_md5_checking(const FLAC__FileDecoder *decoder); +/* + * Methods to return the current number of channels, channel assignment + * bits-per-sample, sample rate in Hz, and blocksize in samples. These + * will only be valid after decoding has started. + */ +unsigned FLAC__file_decoder_get_channels(const FLAC__FileDecoder *decoder); +FLAC__ChannelAssignment FLAC__file_decoder_get_channel_assignment(const FLAC__FileDecoder *decoder); +unsigned FLAC__file_decoder_get_bits_per_sample(const FLAC__FileDecoder *decoder); +unsigned FLAC__file_decoder_get_sample_rate(const FLAC__FileDecoder *decoder); +unsigned FLAC__file_decoder_get_blocksize(const FLAC__FileDecoder *decoder); /* * Initialize the instance; should be called after construction and diff --git a/include/FLAC/seekable_stream_decoder.h b/include/FLAC/seekable_stream_decoder.h index 4535885e..fa887647 100644 --- a/include/FLAC/seekable_stream_decoder.h +++ b/include/FLAC/seekable_stream_decoder.h @@ -153,12 +153,22 @@ FLAC__bool FLAC__seekable_stream_decoder_set_metadata_ignore_all(FLAC__SeekableS */ FLAC__SeekableStreamDecoderState FLAC__seekable_stream_decoder_get_state(const FLAC__SeekableStreamDecoder *decoder); FLAC__bool FLAC__seekable_stream_decoder_get_md5_checking(const FLAC__SeekableStreamDecoder *decoder); +/* + * Methods to return the current number of channels, channel assignment + * bits-per-sample, sample rate in Hz, and blocksize in samples. These + * will only be valid after decoding has started. + */ +unsigned FLAC__seekable_stream_decoder_get_channels(const FLAC__SeekableStreamDecoder *decoder); +FLAC__ChannelAssignment FLAC__seekable_stream_decoder_get_channel_assignment(const FLAC__SeekableStreamDecoder *decoder); +unsigned FLAC__seekable_stream_decoder_get_bits_per_sample(const FLAC__SeekableStreamDecoder *decoder); +unsigned FLAC__seekable_stream_decoder_get_sample_rate(const FLAC__SeekableStreamDecoder *decoder); +unsigned FLAC__seekable_stream_decoder_get_blocksize(const FLAC__SeekableStreamDecoder *decoder); /* * Initialize the instance; should be called after construction and * 'set' calls but before any of the 'process' or 'seek' calls. Will - * set and return the decoder state, which will be FLAC__SEEKABLE_STREAM_DECODER_OK - * if initialization succeeded. + * set and return the decoder state, which will be + * FLAC__SEEKABLE_STREAM_DECODER_OK if initialization succeeded. */ FLAC__SeekableStreamDecoderState FLAC__seekable_stream_decoder_init(FLAC__SeekableStreamDecoder *decoder); @@ -170,6 +180,12 @@ FLAC__SeekableStreamDecoderState FLAC__seekable_stream_decoder_init(FLAC__Seekab */ FLAC__bool FLAC__seekable_stream_decoder_finish(FLAC__SeekableStreamDecoder *decoder); +/* + * state control methods + */ +FLAC__bool FLAC__seekable_stream_decoder_flush(FLAC__SeekableStreamDecoder *decoder); +FLAC__bool FLAC__seekable_stream_decoder_reset(FLAC__SeekableStreamDecoder *decoder); + /* * Methods for decoding the data */