diff options
| author | Josh Coalson <jcoalson@users.sourceforce.net> | 2004-07-07 07:43:18 +0000 |
|---|---|---|
| committer | Josh Coalson <jcoalson@users.sourceforce.net> | 2004-07-07 07:43:18 +0000 |
| commit | f37a397cf1330e99708ec6979d885f26a7ff7b1e (patch) | |
| tree | 33202e469387849fc35805d8eedbbaa4fe028648 /src/libOggFLAC | |
| parent | 3e3ad0c99d5082e922bdda4482e2faf0d7119b81 (diff) | |
| download | flac-f37a397cf1330e99708ec6979d885f26a7ff7b1e.tar.gz | |
get rid of obsolete *_get_decode_position() methods
Diffstat (limited to 'src/libOggFLAC')
| -rw-r--r-- | src/libOggFLAC/file_decoder.c | 10 | ||||
| -rw-r--r-- | src/libOggFLAC/seekable_stream_decoder.c | 16 |
2 files changed, 0 insertions, 26 deletions
diff --git a/src/libOggFLAC/file_decoder.c b/src/libOggFLAC/file_decoder.c index 2e9ee129..c782a12c 100644 --- a/src/libOggFLAC/file_decoder.c +++ b/src/libOggFLAC/file_decoder.c @@ -456,16 +456,6 @@ OggFLAC_API unsigned OggFLAC__file_decoder_get_blocksize(const OggFLAC__FileDeco return OggFLAC__seekable_stream_decoder_get_blocksize(decoder->private_->seekable_stream_decoder); } -#if 0 -@@@@@@ this can never be made to work without writing a custom Ogg decoder; remove for release -OggFLAC_API FLAC__bool OggFLAC__file_decoder_get_decode_position(const OggFLAC__FileDecoder *decoder, FLAC__uint64 *position) -{ - FLAC__ASSERT(0 != decoder); - FLAC__ASSERT(0 != decoder->private_); - return OggFLAC__seekable_stream_decoder_get_decode_position(decoder->private_->seekable_stream_decoder, position); -} -#endif - OggFLAC_API FLAC__bool OggFLAC__file_decoder_process_single(OggFLAC__FileDecoder *decoder) { FLAC__bool ret; diff --git a/src/libOggFLAC/seekable_stream_decoder.c b/src/libOggFLAC/seekable_stream_decoder.c index c405b689..8dd3d16e 100644 --- a/src/libOggFLAC/seekable_stream_decoder.c +++ b/src/libOggFLAC/seekable_stream_decoder.c @@ -541,22 +541,6 @@ OggFLAC_API unsigned OggFLAC__seekable_stream_decoder_get_blocksize(const OggFLA return OggFLAC__stream_decoder_get_blocksize(decoder->private_->stream_decoder); } -#if 0 -@@@@@@ this can never be made to work without writing a custom Ogg decoder; remove for release -OggFLAC_API FLAC__bool OggFLAC__seekable_stream_decoder_get_decode_position(const OggFLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *position) -{ - FLAC__ASSERT(0 != decoder); - FLAC__ASSERT(0 != decoder->private_); - FLAC__ASSERT(0 != position); - - if(decoder->private_->tell_callback(decoder, position, decoder->private_->client_data) != OggFLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK) - return false; - FLAC__ASSERT(*position >= OggFLAC__stream_decoder_get_input_bytes_unconsumed(decoder->private_->stream_decoder)); - *position -= OggFLAC__stream_decoder_get_input_bytes_unconsumed(decoder->private_->stream_decoder); - return true; -} -#endif - OggFLAC_API FLAC__bool OggFLAC__seekable_stream_decoder_flush(OggFLAC__SeekableStreamDecoder *decoder) { FLAC__ASSERT(0 != decoder); |