*::State::resolved_as_cstring() is now inlined
authorJosh Coalson <jcoalson@users.sourceforce.net>
Wed, 24 Sep 2003 04:30:30 +0000 (04:30 +0000)
committerJosh Coalson <jcoalson@users.sourceforce.net>
Wed, 24 Sep 2003 04:30:30 +0000 (04:30 +0000)
src/libFLAC++/file_decoder.cpp
src/libFLAC++/file_encoder.cpp
src/libFLAC++/seekable_stream_decoder.cpp
src/libFLAC++/seekable_stream_encoder.cpp
src/libFLAC++/stream_decoder.cpp
src/libFLAC++/stream_encoder.cpp

index 323d1e7..494109d 100644 (file)
 namespace FLAC {
        namespace Decoder {
 
-               const char *File::State::resolved_as_cstring(const File &decoder) const
-               {
-                       if(state_ == ::FLAC__FILE_DECODER_SEEKABLE_STREAM_DECODER_ERROR) {
-                               FLAC::Decoder::SeekableStream::State state__ = decoder.get_seekable_stream_decoder_state();
-                               if(state__ == ::FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR)
-                                       return decoder.get_stream_decoder_state().as_cstring();
-                               else
-                                       return state__.as_cstring();
-                       }
-                       else
-                               return as_cstring();
-               }
-
                File::File():
                decoder_(::FLAC__file_decoder_new())
                { }
index 038c7b8..ec93a61 100644 (file)
 namespace FLAC {
        namespace Encoder {
 
-               const char *File::State::resolved_as_cstring(const File &encoder) const
-               {
-                       if(state_ == ::FLAC__FILE_ENCODER_SEEKABLE_STREAM_ENCODER_ERROR) {
-                               FLAC::Encoder::SeekableStream::State state__ = encoder.get_seekable_stream_encoder_state();
-                               if(state__ == ::FLAC__SEEKABLE_STREAM_ENCODER_STREAM_ENCODER_ERROR) {
-                                       FLAC::Encoder::Stream::State state___ = encoder.get_stream_encoder_state();
-                                       if(state___ == ::FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR)
-                                               return encoder.get_verify_decoder_state().as_cstring();
-                                       else
-                                               return state___.as_cstring();
-                               }
-                               else
-                                       return state__.as_cstring();
-                       }
-                       else
-                               return as_cstring();
-               }
-
                File::File():
                encoder_(::FLAC__file_encoder_new())
                { }
index df934b0..d3b0b43 100644 (file)
 namespace FLAC {
        namespace Decoder {
 
-               const char *SeekableStream::State::resolved_as_cstring(const SeekableStream &decoder) const
-               {
-                       if(state_ == ::FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR)
-                               return decoder.get_stream_decoder_state().as_cstring();
-                       else
-                               return as_cstring();
-               }
-
                SeekableStream::SeekableStream():
                decoder_(::FLAC__seekable_stream_decoder_new())
                { }
index 769ba41..b23a082 100644 (file)
 namespace FLAC {
        namespace Encoder {
 
-               const char *SeekableStream::State::resolved_as_cstring(const SeekableStream &encoder) const
-               {
-                       if(state_ == ::FLAC__SEEKABLE_STREAM_ENCODER_STREAM_ENCODER_ERROR) {
-                               FLAC::Encoder::Stream::State state__ = encoder.get_stream_encoder_state();
-                               if(state__ == ::FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR)
-                                       return encoder.get_verify_decoder_state().as_cstring();
-                               else
-                                       return state__.as_cstring();
-                       }
-                       else
-                               return as_cstring();
-               }
-
-
                SeekableStream::SeekableStream():
                encoder_(::FLAC__seekable_stream_encoder_new())
                { }
index 39d7de9..30a5d40 100644 (file)
 namespace FLAC {
        namespace Decoder {
 
-               const char *Stream::State::resolved_as_cstring(const Stream &) const
-               {
-                       return as_cstring();
-               }
-
                Stream::Stream():
                decoder_(::FLAC__stream_decoder_new())
                { }
index 27e5d6b..ff9cf30 100644 (file)
 namespace FLAC {
        namespace Encoder {
 
-               const char *Stream::State::resolved_as_cstring(const Stream &encoder) const
-               {
-                       if(state_ == ::FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR)
-                               return encoder.get_verify_decoder_state().as_cstring();
-                       else
-                               return as_cstring();
-               }
-
                Stream::Stream():
                encoder_(::FLAC__stream_encoder_new())
                { }