merge down from merged-API-layer branch: cvs -q up -dP -j API_LAYER_MERGING_BASELINE...

[platform/upstream/flac.git] / src / libOggFLAC++ / stream_decoder.cpp

diff --git a/src/libOggFLAC++/stream_decoder.cpp b/src/libOggFLAC++/stream_decoder.cpp
index 42ab727..b2531ae 100644 (file)
--- a/src/libOggFLAC++/stream_decoder.cpp
+++ b/src/libOggFLAC++/stream_decoder.cpp
@@ -57,6 +57,12 @@ namespace OggFLAC {
                        return 0 != decoder_;
                }
 
+               bool Stream::set_md5_checking(bool value)
+               {
+                       FLAC__ASSERT(is_valid());
+                       return (bool)::OggFLAC__stream_decoder_set_md5_checking(decoder_, value);
+               }
+
                bool Stream::set_serial_number(long value)
                {
                        FLAC__ASSERT(is_valid());
@@ -111,6 +117,18 @@ namespace OggFLAC {
                        return FLAC::Decoder::Stream::State(::OggFLAC__stream_decoder_get_FLAC_stream_decoder_state(decoder_));
                }
 
+               bool Stream::get_md5_checking() const
+               {
+                       FLAC__ASSERT(is_valid());
+                       return (bool)::OggFLAC__stream_decoder_get_md5_checking(decoder_);
+               }
+
+               FLAC__uint64 Stream::get_total_samples() const
+               {
+                       FLAC__ASSERT(is_valid());
+                       return ::OggFLAC__stream_decoder_get_total_samples(decoder_);
+               }
+
                unsigned Stream::get_channels() const
                {
                        FLAC__ASSERT(is_valid());
@@ -141,15 +159,10 @@ namespace OggFLAC {
                        return ::OggFLAC__stream_decoder_get_blocksize(decoder_);
                }
 
-               Stream::State Stream::init()
+               ::FLAC__StreamDecoderInitStatus Stream::init()
                {
                        FLAC__ASSERT(is_valid());
-                       ::OggFLAC__stream_decoder_set_read_callback(decoder_, read_callback_);
-                       ::OggFLAC__stream_decoder_set_write_callback(decoder_, write_callback_);
-                       ::OggFLAC__stream_decoder_set_metadata_callback(decoder_, metadata_callback_);
-                       ::OggFLAC__stream_decoder_set_error_callback(decoder_, error_callback_);
-                       ::OggFLAC__stream_decoder_set_client_data(decoder_, (void*)this);
-                       return State(::OggFLAC__stream_decoder_init(decoder_));
+                       return ::OggFLAC__stream_decoder_init_stream(decoder_, read_callback_, seek_callback_, tell_callback_, length_callback_, eof_callback_, write_callback_, metadata_callback_, error_callback_, /*client_data=*/(void*)this);
                }
 
                void Stream::finish()
@@ -188,7 +201,47 @@ namespace OggFLAC {
                        return (bool)::OggFLAC__stream_decoder_process_until_end_of_stream(decoder_);
                }
 
-               ::FLAC__StreamDecoderReadStatus Stream::read_callback_(const ::OggFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
+               bool Stream::skip_single_frame()
+               {
+                       FLAC__ASSERT(is_valid());
+                       return (bool)::OggFLAC__stream_decoder_skip_single_frame(decoder_);
+               }
+
+               bool Stream::seek_absolute(FLAC__uint64 sample)
+               {
+                       FLAC__ASSERT(is_valid());
+                       return (bool)::OggFLAC__stream_decoder_seek_absolute(decoder_, sample);
+               }
+
+               ::FLAC__StreamDecoderSeekStatus Stream::seek_callback(FLAC__uint64 absolute_byte_offset)
+               {
+                       (void)absolute_byte_offset;
+                       return ::FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED;
+               }
+
+               ::FLAC__StreamDecoderTellStatus Stream::tell_callback(FLAC__uint64 *absolute_byte_offset)
+               {
+                       (void)absolute_byte_offset;
+                       return ::FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED;
+               }
+
+               ::FLAC__StreamDecoderLengthStatus Stream::length_callback(FLAC__uint64 *stream_length)
+               {
+                       (void)stream_length;
+                       return ::FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED;
+               }
+
+               bool Stream::eof_callback()
+               {
+                       return false;
+               }
+
+               void Stream::metadata_callback(const ::FLAC__StreamMetadata *metadata)
+               {
+                       (void)metadata;
+               }
+
+               ::FLAC__StreamDecoderReadStatus Stream::read_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
                {
                        (void)decoder;
                        FLAC__ASSERT(0 != client_data);
@@ -197,7 +250,43 @@ namespace OggFLAC {
                        return instance->read_callback(buffer, bytes);
                }
 
-               ::FLAC__StreamDecoderWriteStatus Stream::write_callback_(const ::OggFLAC__StreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+               ::FLAC__StreamDecoderSeekStatus Stream::seek_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data)
+               {
+                       (void) decoder;
+                       FLAC__ASSERT(0 != client_data);
+                       Stream *instance = reinterpret_cast<Stream *>(client_data);
+                       FLAC__ASSERT(0 != instance);
+                       return instance->seek_callback(absolute_byte_offset);
+               }
+
+               ::FLAC__StreamDecoderTellStatus Stream::tell_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
+               {
+                       (void) decoder;
+                       FLAC__ASSERT(0 != client_data);
+                       Stream *instance = reinterpret_cast<Stream *>(client_data);
+                       FLAC__ASSERT(0 != instance);
+                       return instance->tell_callback(absolute_byte_offset);
+               }
+
+               ::FLAC__StreamDecoderLengthStatus Stream::length_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)
+               {
+                       (void) decoder;
+                       FLAC__ASSERT(0 != client_data);
+                       Stream *instance = reinterpret_cast<Stream *>(client_data);
+                       FLAC__ASSERT(0 != instance);
+                       return instance->length_callback(stream_length);
+               }
+
+               FLAC__bool Stream::eof_callback_(const ::FLAC__StreamDecoder *decoder, void *client_data)
+               {
+                       (void) decoder;
+                       FLAC__ASSERT(0 != client_data);
+                       Stream *instance = reinterpret_cast<Stream *>(client_data);
+                       FLAC__ASSERT(0 != instance);
+                       return instance->eof_callback();
+               }
+
+               ::FLAC__StreamDecoderWriteStatus Stream::write_callback_(const ::FLAC__StreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
                {
                        (void)decoder;
                        FLAC__ASSERT(0 != client_data);
@@ -206,7 +295,7 @@ namespace OggFLAC {
                        return instance->write_callback(frame, buffer);
                }
 
-               void Stream::metadata_callback_(const ::OggFLAC__StreamDecoder *decoder, const ::FLAC__StreamMetadata *metadata, void *client_data)
+               void Stream::metadata_callback_(const ::FLAC__StreamDecoder *decoder, const ::FLAC__StreamMetadata *metadata, void *client_data)
                {
                        (void)decoder;
                        FLAC__ASSERT(0 != client_data);
@@ -215,7 +304,7 @@ namespace OggFLAC {
                        instance->metadata_callback(metadata);
                }
 
-               void Stream::error_callback_(const ::OggFLAC__StreamDecoder *decoder, ::FLAC__StreamDecoderErrorStatus status, void *client_data)
+               void Stream::error_callback_(const ::FLAC__StreamDecoder *decoder, ::FLAC__StreamDecoderErrorStatus status, void *client_data)
                {
                        (void)decoder;
                        FLAC__ASSERT(0 != client_data);