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 79ca49a..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
@@ -40,6 +41,12 @@
 namespace FLAC {
        namespace Decoder {
 
+               // ------------------------------------------------------------
+               //
+               // Stream
+               //
+               // ------------------------------------------------------------
+
                Stream::Stream():
                decoder_(::FLAC__stream_decoder_new())
                { }
@@ -47,7 +54,7 @@ namespace FLAC {
                Stream::~Stream()
                {
                        if(0 != decoder_) {
-                               ::FLAC__stream_decoder_finish(decoder_);
+                               (void)::FLAC__stream_decoder_finish(decoder_);
                                ::FLAC__stream_decoder_delete(decoder_);
                        }
                }
@@ -57,6 +64,12 @@ namespace FLAC {
                        return 0 != decoder_;
                }
 
+               bool Stream::set_ogg_serial_number(long value)
+               {
+                       FLAC__ASSERT(is_valid());
+                       return (bool)::FLAC__stream_decoder_set_ogg_serial_number(decoder_, value);
+               }
+
                bool Stream::set_md5_checking(bool value)
                {
                        FLAC__ASSERT(is_valid());
@@ -147,16 +160,28 @@ 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());
                        return ::FLAC__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()
+               ::FLAC__StreamDecoderInitStatus Stream::init_ogg()
+               {
+                       FLAC__ASSERT(is_valid());
+                       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);
+               }
+
+               bool Stream::finish()
                {
                        FLAC__ASSERT(is_valid());
-                       ::FLAC__stream_decoder_finish(decoder_);
+                       return (bool)::FLAC__stream_decoder_finish(decoder_);
                }
 
                bool Stream::flush()
@@ -229,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);
@@ -301,5 +326,65 @@ namespace FLAC {
                        instance->error_callback(status);
                }
 
+               // ------------------------------------------------------------
+               //
+               // File
+               //
+               // ------------------------------------------------------------
+
+               File::File():
+                       Stream()
+               { }
+
+               File::~File()
+               {
+               }
+
+               ::FLAC__StreamDecoderInitStatus File::init(FILE *file)
+               {
+                       FLAC__ASSERT(0 != decoder_);
+                       return ::FLAC__stream_decoder_init_FILE(decoder_, file, write_callback_, metadata_callback_, error_callback_, /*client_data=*/(void*)this);
+               }
+
+               ::FLAC__StreamDecoderInitStatus File::init(const char *filename)
+               {
+                       FLAC__ASSERT(0 != decoder_);
+                       return ::FLAC__stream_decoder_init_file(decoder_, filename, write_callback_, metadata_callback_, error_callback_, /*client_data=*/(void*)this);
+               }
+
+               ::FLAC__StreamDecoderInitStatus File::init(const std::string &filename)
+               {
+                       return init(filename.c_str());
+               }
+
+               ::FLAC__StreamDecoderInitStatus File::init_ogg(FILE *file)
+               {
+                       FLAC__ASSERT(0 != decoder_);
+                       return ::FLAC__stream_decoder_init_ogg_FILE(decoder_, file, write_callback_, metadata_callback_, error_callback_, /*client_data=*/(void*)this);
+               }
+
+               ::FLAC__StreamDecoderInitStatus File::init_ogg(const char *filename)
+               {
+                       FLAC__ASSERT(0 != decoder_);
+                       return ::FLAC__stream_decoder_init_ogg_file(decoder_, filename, write_callback_, metadata_callback_, error_callback_, /*client_data=*/(void*)this);
+               }
+
+               ::FLAC__StreamDecoderInitStatus File::init_ogg(const std::string &filename)
+               {
+                       return init_ogg(filename.c_str());
+               }
+
+               // This is a dummy to satisfy the pure virtual from Stream; the
+               // read callback will never be called since we are initializing
+               // 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[], size_t *bytes)
+               {
+                       (void)buffer, (void)bytes;
+                       FLAC__ASSERT(false);
+                       return ::FLAC__STREAM_DECODER_READ_STATUS_ABORT; // double protection
+               }
+
        }
 }