rename (FLAC__format_is_valid_sample_rate() to FLAC__format_sample_rate_is_valid()
[flac.git] / src / libFLAC++ / seekable_stream_decoder.cc
index 81744b3..85de046 100644 (file)
@@ -46,7 +46,7 @@ namespace FLAC {
                        return (bool)::FLAC__seekable_stream_decoder_set_md5_checking(decoder_, value);
                }
 
-               bool SeekableStream::set_metadata_respond(::FLAC__MetaDataType type)
+               bool SeekableStream::set_metadata_respond(::FLAC__MetadataType type)
                {
                        FLAC__ASSERT(is_valid());
                        return (bool)::FLAC__seekable_stream_decoder_set_metadata_respond(decoder_, type);
@@ -64,7 +64,7 @@ namespace FLAC {
                        return (bool)::FLAC__seekable_stream_decoder_set_metadata_respond_all(decoder_);
                }
 
-               bool SeekableStream::set_metadata_ignore(::FLAC__MetaDataType type)
+               bool SeekableStream::set_metadata_ignore(::FLAC__MetadataType type)
                {
                        FLAC__ASSERT(is_valid());
                        return (bool)::FLAC__seekable_stream_decoder_set_metadata_ignore(decoder_, type);
@@ -94,6 +94,36 @@ namespace FLAC {
                        return (bool)::FLAC__seekable_stream_decoder_get_md5_checking(decoder_);
                }
 
+               unsigned SeekableStream::get_channels() const
+               {
+                       FLAC__ASSERT(is_valid());
+                       return ::FLAC__seekable_stream_decoder_get_channels(decoder_);
+               }
+
+               ::FLAC__ChannelAssignment SeekableStream::get_channel_assignment() const
+               {
+                       FLAC__ASSERT(is_valid());
+                       return ::FLAC__seekable_stream_decoder_get_channel_assignment(decoder_);
+               }
+
+               unsigned SeekableStream::get_bits_per_sample() const
+               {
+                       FLAC__ASSERT(is_valid());
+                       return ::FLAC__seekable_stream_decoder_get_bits_per_sample(decoder_);
+               }
+
+               unsigned SeekableStream::get_sample_rate() const
+               {
+                       FLAC__ASSERT(is_valid());
+                       return ::FLAC__seekable_stream_decoder_get_sample_rate(decoder_);
+               }
+
+               unsigned SeekableStream::get_blocksize() const
+               {
+                       FLAC__ASSERT(is_valid());
+                       return ::FLAC__seekable_stream_decoder_get_blocksize(decoder_);
+               }
+
                SeekableStream::State SeekableStream::init()
                {
                        FLAC__ASSERT(is_valid());
@@ -115,6 +145,18 @@ namespace FLAC {
                        return (bool)::FLAC__seekable_stream_decoder_finish(decoder_);
                }
 
+               bool SeekableStream::flush()
+               {
+                       FLAC__ASSERT(is_valid());
+                       return (bool)::FLAC__seekable_stream_decoder_flush(decoder_);
+               }
+
+               bool SeekableStream::reset()
+               {
+                       FLAC__ASSERT(is_valid());
+                       return (bool)::FLAC__seekable_stream_decoder_reset(decoder_);
+               }
+
                bool SeekableStream::process_whole_stream()
                {
                        FLAC__ASSERT(is_valid());
@@ -190,7 +232,7 @@ namespace FLAC {
                        return instance->eof_callback();
                }
 
-               FLAC__StreamDecoderWriteStatus SeekableStream::write_callback_(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 *buffer[], void *client_data)
+               FLAC__StreamDecoderWriteStatus SeekableStream::write_callback_(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
                {
                        (void) decoder;
                        FLAC__ASSERT(0 != client_data);
@@ -199,7 +241,7 @@ namespace FLAC {
                        return instance->write_callback(frame, buffer);
                }
 
-               void SeekableStream::metadata_callback_(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__StreamMetaData *metadata, void *client_data)
+               void SeekableStream::metadata_callback_(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__StreamMetadata *metadata, void *client_data)
                {
                        (void) decoder;
                        FLAC__ASSERT(0 != client_data);