mirror of
https://github.com/claunia/flac.git
synced 2025-12-16 18:54:26 +00:00
massive glob of checkins: improved tests, more tests, bugfixes
This commit is contained in:
@@ -17,12 +17,12 @@
|
||||
# Boston, MA 02111-1307, USA.
|
||||
|
||||
lib_LTLIBRARIES = libFLAC++.la
|
||||
CFLAGS = @CFLAGS@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
|
||||
#@@@@ fix this
|
||||
libFLAC++_la_LDFLAGS = -version-info 2:1:1
|
||||
# see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention
|
||||
libFLAC___la_LDFLAGS = -version-info 1:0:0
|
||||
|
||||
libFLAC++_la_SOURCES = \
|
||||
libFLAC___la_SOURCES = \
|
||||
file_decoder.cc \
|
||||
metadata.cc \
|
||||
seekable_stream_decoder.cc \
|
||||
|
||||
@@ -176,7 +176,7 @@ namespace FLAC {
|
||||
return (bool)::FLAC__file_decoder_seek_absolute(decoder_, sample);
|
||||
}
|
||||
|
||||
::FLAC__StreamDecoderWriteStatus File::write_callback_(const ::FLAC__FileDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 *buffer[], void *client_data)
|
||||
::FLAC__StreamDecoderWriteStatus File::write_callback_(const ::FLAC__FileDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
|
||||
{
|
||||
(void) decoder;
|
||||
FLAC__ASSERT(0 != client_data);
|
||||
|
||||
@@ -61,7 +61,8 @@ namespace FLAC {
|
||||
// Prototype
|
||||
//
|
||||
|
||||
Prototype::Prototype(::FLAC__StreamMetaData *object, bool copy)
|
||||
Prototype::Prototype(::FLAC__StreamMetaData *object, bool copy):
|
||||
object_(0)
|
||||
{
|
||||
FLAC__ASSERT(0 != object);
|
||||
clear();
|
||||
|
||||
@@ -232,7 +232,7 @@ namespace FLAC {
|
||||
return instance->eof_callback();
|
||||
}
|
||||
|
||||
FLAC__StreamDecoderWriteStatus SeekableStream::write_callback_(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 *buffer[], void *client_data)
|
||||
FLAC__StreamDecoderWriteStatus SeekableStream::write_callback_(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
|
||||
{
|
||||
(void) decoder;
|
||||
FLAC__ASSERT(0 != client_data);
|
||||
|
||||
@@ -174,7 +174,7 @@ namespace FLAC {
|
||||
return instance->read_callback(buffer, bytes);
|
||||
}
|
||||
|
||||
::FLAC__StreamDecoderWriteStatus Stream::write_callback_(const ::FLAC__StreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 *buffer[], void *client_data)
|
||||
::FLAC__StreamDecoderWriteStatus Stream::write_callback_(const ::FLAC__StreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
|
||||
{
|
||||
(void)decoder;
|
||||
FLAC__ASSERT(0 != client_data);
|
||||
|
||||
@@ -136,7 +136,7 @@ namespace FLAC {
|
||||
return (bool)::FLAC__stream_encoder_set_total_samples_estimate(encoder_, value);
|
||||
}
|
||||
|
||||
bool Stream::set_metadata(FLAC__StreamMetaData **metadata, unsigned num_blocks)
|
||||
bool Stream::set_metadata(::FLAC__StreamMetaData **metadata, unsigned num_blocks)
|
||||
{
|
||||
FLAC__ASSERT(is_valid());
|
||||
return (bool)::FLAC__stream_encoder_set_metadata(encoder_, metadata, num_blocks);
|
||||
@@ -241,9 +241,9 @@ namespace FLAC {
|
||||
Stream::State Stream::init()
|
||||
{
|
||||
FLAC__ASSERT(is_valid());
|
||||
FLAC__stream_encoder_set_write_callback(encoder_, write_callback_);
|
||||
FLAC__stream_encoder_set_metadata_callback(encoder_, metadata_callback_);
|
||||
FLAC__stream_encoder_set_client_data(encoder_, (void*)this);
|
||||
::FLAC__stream_encoder_set_write_callback(encoder_, write_callback_);
|
||||
::FLAC__stream_encoder_set_metadata_callback(encoder_, metadata_callback_);
|
||||
::FLAC__stream_encoder_set_client_data(encoder_, (void*)this);
|
||||
return State(::FLAC__stream_encoder_init(encoder_));
|
||||
}
|
||||
|
||||
@@ -253,16 +253,16 @@ namespace FLAC {
|
||||
::FLAC__stream_encoder_finish(encoder_);
|
||||
}
|
||||
|
||||
bool Stream::process(const FLAC__int32 *buf[], unsigned samples)
|
||||
bool Stream::process(const FLAC__int32 * const buffer[], unsigned samples)
|
||||
{
|
||||
FLAC__ASSERT(is_valid());
|
||||
return (bool)::FLAC__stream_encoder_process(encoder_, buf, samples);
|
||||
return (bool)::FLAC__stream_encoder_process(encoder_, buffer, samples);
|
||||
}
|
||||
|
||||
bool Stream::process_interleaved(const FLAC__int32 buf[], unsigned samples)
|
||||
bool Stream::process_interleaved(const FLAC__int32 buffer[], unsigned samples)
|
||||
{
|
||||
FLAC__ASSERT(is_valid());
|
||||
return (bool)::FLAC__stream_encoder_process_interleaved(encoder_, buf, samples);
|
||||
return (bool)::FLAC__stream_encoder_process_interleaved(encoder_, buffer, samples);
|
||||
}
|
||||
|
||||
::FLAC__StreamEncoderWriteStatus Stream::write_callback_(const ::FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
|
||||
|
||||
Reference in New Issue
Block a user