From f37a397cf1330e99708ec6979d885f26a7ff7b1e Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Wed, 7 Jul 2004 07:43:18 +0000 Subject: [PATCH] get rid of obsolete *_get_decode_position() methods --- include/OggFLAC/file_decoder.h | 17 ----------------- include/OggFLAC/seekable_stream_decoder.h | 19 ------------------- src/libOggFLAC/file_decoder.c | 10 ---------- src/libOggFLAC/seekable_stream_decoder.c | 16 ---------------- 4 files changed, 62 deletions(-) diff --git a/include/OggFLAC/file_decoder.h b/include/OggFLAC/file_decoder.h index cd3c737f..eba9d217 100644 --- a/include/OggFLAC/file_decoder.h +++ b/include/OggFLAC/file_decoder.h @@ -530,23 +530,6 @@ OggFLAC_API unsigned OggFLAC__file_decoder_get_sample_rate(const OggFLAC__FileDe */ OggFLAC_API unsigned OggFLAC__file_decoder_get_blocksize(const OggFLAC__FileDecoder *decoder); -#if 0 -@@@@@@ this can never be made to work without writing a custom Ogg decoder; remove for release -/** This is inherited from FLAC__FileDecoder; see - * FLAC__file_decoder_get_decode_position(). - * - * \param decoder A decoder instance to query. - * \param position Address at which to return the desired position. - * \assert - * \code decoder != NULL \endcode - * \code position != NULL \endcode - * \retval FLAC__bool - * \c true if successful, \c false if there was an error from - * the 'tell' callback. - */ -OggFLAC_API FLAC__bool OggFLAC__file_decoder_get_decode_position(const OggFLAC__FileDecoder *decoder, FLAC__uint64 *position); -#endif - /** Initialize the decoder instance. * Should be called after OggFLAC__file_decoder_new() and * OggFLAC__file_decoder_set_*() but before any of the diff --git a/include/OggFLAC/seekable_stream_decoder.h b/include/OggFLAC/seekable_stream_decoder.h index 23a80667..0a576a5f 100644 --- a/include/OggFLAC/seekable_stream_decoder.h +++ b/include/OggFLAC/seekable_stream_decoder.h @@ -738,25 +738,6 @@ OggFLAC_API unsigned OggFLAC__seekable_stream_decoder_get_sample_rate(const OggF */ OggFLAC_API unsigned OggFLAC__seekable_stream_decoder_get_blocksize(const OggFLAC__SeekableStreamDecoder *decoder); -#if 0 -@@@@@@ this can never be made to work without writing a custom Ogg decoder; remove for release -/** Returns the decoder's current read position within the stream. - * This is inherited from FLAC__SeekableStreamDecoder; see - * FLAC__seekable_stream_decoder_get_decode_position(). - * - * \param decoder A decoder instance to query. - * \param position Address at which to return the desired position. - * \assert - * \code decoder != NULL \endcode - * \code position != NULL \endcode - * \retval FLAC__bool - * \c true if successful, \c false if there was an error from - * the 'tell' callback. - */ -/*@@@@@@ probably does not work... is it used? */ -OggFLAC_API FLAC__bool OggFLAC__seekable_stream_decoder_get_decode_position(const OggFLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *position); -#endif - /** Initialize the decoder instance. * Should be called after OggFLAC__seekable_stream_decoder_new() and * OggFLAC__seekable_stream_decoder_set_*() but before any of the 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);