Set version to 1.3.0 and update coyprights throughout.

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

diff --git a/src/libFLAC++/stream_decoder.cpp b/src/libFLAC++/stream_decoder.cpp
index 20e7731..5d68c28 100644 (file)
--- a/src/libFLAC++/stream_decoder.cpp
+++ b/src/libFLAC++/stream_decoder.cpp
@@ -1,5 +1,6 @@
 /* libFLAC++ - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
+ * Copyright (C) 2002-2009  Josh Coalson
+ * Copyright (C) 2011-2013  Xiph.Org Foundation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -50,20 +51,10 @@ namespace FLAC {
                decoder_(::FLAC__stream_decoder_new())
                { }
 
-               Stream::Stream(::FLAC__StreamDecoder *decoder):
-               decoder_(decoder)
-               { }
-
                Stream::~Stream()
                {
-            // WATCHOUT: must check for NULL not only because
-            // ::FLAC__stream_encoder_new() might have failed in
-            // the constructor, but also because
-            // OggFLAC::Encoder::Stream deletes the encoder_ before
-            // we get to it here to make the C inheritance magic
-            // work.
                        if(0 != decoder_) {
-                               ::FLAC__stream_decoder_finish(decoder_);
+                               (void)::FLAC__stream_decoder_finish(decoder_);
                                ::FLAC__stream_decoder_delete(decoder_);
                        }
                }
@@ -169,6 +160,12 @@ namespace FLAC {
                        return ::FLAC__stream_decoder_get_blocksize(decoder_);
                }
 
+               bool Stream::get_decode_position(FLAC__uint64 *position) const
+               {
+                       FLAC__ASSERT(is_valid());
+                       return ::FLAC__stream_decoder_get_decode_position(decoder_, position);
+               }
+
                ::FLAC__StreamDecoderInitStatus Stream::init()
                {
                        FLAC__ASSERT(is_valid());
@@ -181,10 +178,10 @@ namespace FLAC {
                        return ::FLAC__stream_decoder_init_ogg_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()
+               bool Stream::finish()
                {
                        FLAC__ASSERT(is_valid());
-                       ::FLAC__stream_decoder_finish(decoder_);
+                       return (bool)::FLAC__stream_decoder_finish(decoder_);
                }
 
                bool Stream::flush()
@@ -257,7 +254,7 @@ namespace FLAC {
                        (void)metadata;
                }
 
-               ::FLAC__StreamDecoderReadStatus Stream::read_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
+               ::FLAC__StreamDecoderReadStatus Stream::read_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
                {
                        (void)decoder;
                        FLAC__ASSERT(0 != client_data);
@@ -382,7 +379,7 @@ namespace FLAC {
                // with FLAC__stream_decoder_init_FILE() or
                // FLAC__stream_decoder_init_file() and those supply the read
                // callback internally.
-               ::FLAC__StreamDecoderReadStatus File::read_callback(FLAC__byte buffer[], unsigned *bytes)
+               ::FLAC__StreamDecoderReadStatus File::read_callback(FLAC__byte buffer[], size_t *bytes)
                {
                        (void)buffer, (void)bytes;
                        FLAC__ASSERT(false);