Commit fa697a98 authored by Josh Coalson's avatar Josh Coalson
Browse files

rename some struct members to avoid C++ 'private' and 'protected' keywords

parent 07afedcb
......@@ -47,8 +47,8 @@ extern const char *FLAC__FileDecoderStateString[];
struct FLAC__FileDecoderProtected;
struct FLAC__FileDecoderPrivate;
typedef struct {
struct FLAC__FileDecoderProtected *protected;
struct FLAC__FileDecoderPrivate *private;
struct FLAC__FileDecoderProtected *protected_; /* avoid the C++ keyword 'protected' */
struct FLAC__FileDecoderPrivate *private_; /* avoid the C++ keyword 'private' */
} FLAC__FileDecoder;
/***********************************************************************
......
......@@ -66,8 +66,8 @@ extern const char *FLAC__StreamDecoderErrorStatusString[];
struct FLAC__StreamDecoderProtected;
struct FLAC__StreamDecoderPrivate;
typedef struct {
struct FLAC__StreamDecoderProtected *protected;
struct FLAC__StreamDecoderPrivate *private;
struct FLAC__StreamDecoderProtected *protected_; /* avoid the C++ keyword 'protected' */
struct FLAC__StreamDecoderPrivate *private_; /* avoid the C++ keyword 'private' */
} FLAC__StreamDecoder;
/***********************************************************************
......
......@@ -60,8 +60,8 @@ extern const char *FLAC__StreamEncoderWriteStatusString[];
struct FLAC__StreamEncoderProtected;
struct FLAC__StreamEncoderPrivate;
typedef struct {
struct FLAC__StreamEncoderProtected *protected;
struct FLAC__StreamEncoderPrivate *private;
struct FLAC__StreamEncoderProtected *protected_; /* avoid the C++ keyword 'protected' */
struct FLAC__StreamEncoderPrivate *private_; /* avoid the C++ keyword 'private' */
} FLAC__StreamEncoder;
/***********************************************************************
......
......@@ -98,25 +98,25 @@ FLAC__FileDecoder *FLAC__file_decoder_new()
if(decoder == 0) {
return 0;
}
decoder->protected = (FLAC__FileDecoderProtected*)malloc(sizeof(FLAC__FileDecoderProtected));
if(decoder->protected == 0) {
decoder->protected_ = (FLAC__FileDecoderProtected*)malloc(sizeof(FLAC__FileDecoderProtected));
if(decoder->protected_ == 0) {
free(decoder);
return 0;
}
decoder->private = (FLAC__FileDecoderPrivate*)malloc(sizeof(FLAC__FileDecoderPrivate));
if(decoder->private == 0) {
free(decoder->protected);
decoder->private_ = (FLAC__FileDecoderPrivate*)malloc(sizeof(FLAC__FileDecoderPrivate));
if(decoder->private_ == 0) {
free(decoder->protected_);
free(decoder);
return 0;
}
decoder->protected->state = FLAC__FILE_DECODER_UNINITIALIZED;
decoder->protected_->state = FLAC__FILE_DECODER_UNINITIALIZED;
decoder->private->filename = 0;
decoder->private->write_callback = 0;
decoder->private->metadata_callback = 0;
decoder->private->error_callback = 0;
decoder->private->client_data = 0;
decoder->private_->filename = 0;
decoder->private_->write_callback = 0;
decoder->private_->metadata_callback = 0;
decoder->private_->error_callback = 0;
decoder->private_->client_data = 0;
return decoder;
}
......@@ -124,11 +124,11 @@ FLAC__FileDecoder *FLAC__file_decoder_new()
void FLAC__file_decoder_delete(FLAC__FileDecoder *decoder)
{
FLAC__ASSERT(decoder != 0);
FLAC__ASSERT(decoder->protected != 0);
FLAC__ASSERT(decoder->private != 0);
FLAC__ASSERT(decoder->protected_ != 0);
FLAC__ASSERT(decoder->private_ != 0);
free(decoder->private);
free(decoder->protected);
free(decoder->private_);
free(decoder->protected_);
free(decoder);
}
......@@ -142,25 +142,25 @@ FLAC__FileDecoderState FLAC__file_decoder_init(FLAC__FileDecoder *decoder)
{
FLAC__ASSERT(decoder != 0);
if(decoder->protected->state != FLAC__FILE_DECODER_UNINITIALIZED)
return decoder->protected->state = FLAC__FILE_DECODER_ALREADY_INITIALIZED;
if(decoder->protected_->state != FLAC__FILE_DECODER_UNINITIALIZED)
return decoder->protected_->state = FLAC__FILE_DECODER_ALREADY_INITIALIZED;
decoder->protected->state = FLAC__FILE_DECODER_OK;
decoder->protected_->state = FLAC__FILE_DECODER_OK;
if(0 == decoder->private->write_callback || 0 == decoder->private->metadata_callback || 0 == decoder->private->error_callback)
return decoder->protected->state = FLAC__FILE_DECODER_INVALID_CALLBACK;
if(0 == decoder->private_->write_callback || 0 == decoder->private_->metadata_callback || 0 == decoder->private_->error_callback)
return decoder->protected_->state = FLAC__FILE_DECODER_INVALID_CALLBACK;
decoder->private->file = 0;
decoder->private->stream_decoder = 0;
decoder->private->seek_table = 0;
decoder->private_->file = 0;
decoder->private_->stream_decoder = 0;
decoder->private_->seek_table = 0;
if(0 == strcmp(decoder->private->filename, "-"))
decoder->private->file = stdin;
if(0 == strcmp(decoder->private_->filename, "-"))
decoder->private_->file = stdin;
else
decoder->private->file = fopen(decoder->private->filename, "rb");
decoder->private_->file = fopen(decoder->private_->filename, "rb");
if(decoder->private->file == 0)
return decoder->protected->state = FLAC__FILE_DECODER_ERROR_OPENING_FILE;
if(decoder->private_->file == 0)
return decoder->protected_->state = FLAC__FILE_DECODER_ERROR_OPENING_FILE;
/* We initialize the MD5Context even though we may never use it. This is
* because md5_checking may be turned on to start and then turned off if a
......@@ -168,20 +168,20 @@ FLAC__FileDecoderState FLAC__file_decoder_init(FLAC__FileDecoder *decoder)
* FLAC__file_decoder_finish() to make sure things are always cleaned up
* properly.
*/
MD5Init(&decoder->private->md5context);
MD5Init(&decoder->private_->md5context);
decoder->private->stream_decoder = FLAC__stream_decoder_new();
decoder->private_->stream_decoder = FLAC__stream_decoder_new();
FLAC__stream_decoder_set_read_callback(decoder->private->stream_decoder, read_callback_);
FLAC__stream_decoder_set_write_callback(decoder->private->stream_decoder, write_callback_);
FLAC__stream_decoder_set_metadata_callback(decoder->private->stream_decoder, metadata_callback_);
FLAC__stream_decoder_set_error_callback(decoder->private->stream_decoder, error_callback_);
FLAC__stream_decoder_set_client_data(decoder->private->stream_decoder, decoder);
FLAC__stream_decoder_set_read_callback(decoder->private_->stream_decoder, read_callback_);
FLAC__stream_decoder_set_write_callback(decoder->private_->stream_decoder, write_callback_);
FLAC__stream_decoder_set_metadata_callback(decoder->private_->stream_decoder, metadata_callback_);
FLAC__stream_decoder_set_error_callback(decoder->private_->stream_decoder, error_callback_);
FLAC__stream_decoder_set_client_data(decoder->private_->stream_decoder, decoder);
if(FLAC__stream_decoder_init(decoder->private->stream_decoder) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
return decoder->protected->state = FLAC__FILE_DECODER_STREAM_DECODER_ERROR;
if(FLAC__stream_decoder_init(decoder->private_->stream_decoder) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
return decoder->protected_->state = FLAC__FILE_DECODER_STREAM_DECODER_ERROR;
return decoder->protected->state;
return decoder->protected_->state;
}
FLAC__bool FLAC__file_decoder_finish(FLAC__FileDecoder *decoder)
......@@ -189,88 +189,88 @@ FLAC__bool FLAC__file_decoder_finish(FLAC__FileDecoder *decoder)
FLAC__bool md5_failed = false;
FLAC__ASSERT(decoder != 0);
if(decoder->protected->state == FLAC__FILE_DECODER_UNINITIALIZED)
if(decoder->protected_->state == FLAC__FILE_DECODER_UNINITIALIZED)
return true;
if(decoder->private->file != 0 && decoder->private->file != stdin)
fclose(decoder->private->file);
if(0 != decoder->private->filename)
free(decoder->private->filename);
if(decoder->private_->file != 0 && decoder->private_->file != stdin)
fclose(decoder->private_->file);
if(0 != decoder->private_->filename)
free(decoder->private_->filename);
/* see the comment in FLAC__file_decoder_init() as to why we always
* call MD5Final()
*/
MD5Final(decoder->private->computed_md5sum, &decoder->private->md5context);
if(decoder->private->stream_decoder != 0) {
FLAC__stream_decoder_finish(decoder->private->stream_decoder);
FLAC__stream_decoder_delete(decoder->private->stream_decoder);
MD5Final(decoder->private_->computed_md5sum, &decoder->private_->md5context);
if(decoder->private_->stream_decoder != 0) {
FLAC__stream_decoder_finish(decoder->private_->stream_decoder);
FLAC__stream_decoder_delete(decoder->private_->stream_decoder);
}
if(decoder->protected->md5_checking) {
if(memcmp(decoder->private->stored_md5sum, decoder->private->computed_md5sum, 16))
if(decoder->protected_->md5_checking) {
if(memcmp(decoder->private_->stored_md5sum, decoder->private_->computed_md5sum, 16))
md5_failed = true;
}
decoder->protected->state = FLAC__FILE_DECODER_UNINITIALIZED;
decoder->protected_->state = FLAC__FILE_DECODER_UNINITIALIZED;
return !md5_failed;
}
FLAC__bool FLAC__file_decoder_set_md5_checking(const FLAC__FileDecoder *decoder, FLAC__bool value)
{
if(decoder->protected->state != FLAC__FILE_DECODER_UNINITIALIZED)
if(decoder->protected_->state != FLAC__FILE_DECODER_UNINITIALIZED)
return false;
decoder->protected->md5_checking = value;
decoder->protected_->md5_checking = value;
return true;
}
FLAC__bool FLAC__file_decoder_set_filename(const FLAC__FileDecoder *decoder, const char *value)
{
if(decoder->protected->state != FLAC__FILE_DECODER_UNINITIALIZED)
if(decoder->protected_->state != FLAC__FILE_DECODER_UNINITIALIZED)
return false;
if(0 == (decoder->private->filename = (char*)malloc(strlen(value)+1))) {
decoder->protected->state = FLAC__FILE_DECODER_MEMORY_ALLOCATION_ERROR;
if(0 == (decoder->private_->filename = (char*)malloc(strlen(value)+1))) {
decoder->protected_->state = FLAC__FILE_DECODER_MEMORY_ALLOCATION_ERROR;
return false;
}
strcpy(decoder->private->filename, value);
strcpy(decoder->private_->filename, value);
return true;
}
FLAC__bool FLAC__file_decoder_set_write_callback(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderWriteStatus (*value)(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *buffer[], void *client_data))
{
if(decoder->protected->state != FLAC__FILE_DECODER_UNINITIALIZED)
if(decoder->protected_->state != FLAC__FILE_DECODER_UNINITIALIZED)
return false;
decoder->private->write_callback = value;
decoder->private_->write_callback = value;
return true;
}
FLAC__bool FLAC__file_decoder_set_metadata_callback(const FLAC__FileDecoder *decoder, void (*value)(const FLAC__FileDecoder *decoder, const FLAC__StreamMetaData *metadata, void *client_data))
{
if(decoder->protected->state != FLAC__FILE_DECODER_UNINITIALIZED)
if(decoder->protected_->state != FLAC__FILE_DECODER_UNINITIALIZED)
return false;
decoder->private->metadata_callback = value;
decoder->private_->metadata_callback = value;
return true;
}
FLAC__bool FLAC__file_decoder_set_error_callback(const FLAC__FileDecoder *decoder, void (*value)(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data))
{
if(decoder->protected->state != FLAC__FILE_DECODER_UNINITIALIZED)
if(decoder->protected_->state != FLAC__FILE_DECODER_UNINITIALIZED)
return false;
decoder->private->error_callback = value;
decoder->private_->error_callback = value;
return true;
}
FLAC__bool FLAC__file_decoder_set_client_data(const FLAC__FileDecoder *decoder, void *value)
{
if(decoder->protected->state != FLAC__FILE_DECODER_UNINITIALIZED)
if(decoder->protected_->state != FLAC__FILE_DECODER_UNINITIALIZED)
return false;
decoder->private->client_data = value;
decoder->private_->client_data = value;
return true;
}
FLAC__FileDecoderState FLAC__file_decoder_get_state(const FLAC__FileDecoder *decoder)
{
return decoder->protected->state;
return decoder->protected_->state;
}
FLAC__bool FLAC__file_decoder_get_md5_checking(const FLAC__FileDecoder *decoder)
{
return decoder->protected->md5_checking;
return decoder->protected_->md5_checking;
}
FLAC__bool FLAC__file_decoder_process_whole_file(FLAC__FileDecoder *decoder)
......@@ -278,17 +278,17 @@ FLAC__bool FLAC__file_decoder_process_whole_file(FLAC__FileDecoder *decoder)
FLAC__bool ret;
FLAC__ASSERT(decoder != 0);
if(decoder->private->stream_decoder->protected->state == FLAC__STREAM_DECODER_END_OF_STREAM)
decoder->protected->state = FLAC__FILE_DECODER_END_OF_FILE;
if(decoder->private_->stream_decoder->protected_->state == FLAC__STREAM_DECODER_END_OF_STREAM)
decoder->protected_->state = FLAC__FILE_DECODER_END_OF_FILE;
if(decoder->protected->state == FLAC__FILE_DECODER_END_OF_FILE)
if(decoder->protected_->state == FLAC__FILE_DECODER_END_OF_FILE)
return true;
FLAC__ASSERT(decoder->protected->state == FLAC__FILE_DECODER_OK);
FLAC__ASSERT(decoder->protected_->state == FLAC__FILE_DECODER_OK);
ret = FLAC__stream_decoder_process_whole_stream(decoder->private->stream_decoder);
ret = FLAC__stream_decoder_process_whole_stream(decoder->private_->stream_decoder);
if(!ret)
decoder->protected->state = FLAC__FILE_DECODER_STREAM_ERROR;
decoder->protected_->state = FLAC__FILE_DECODER_STREAM_ERROR;
return ret;
}
......@@ -298,17 +298,17 @@ FLAC__bool FLAC__file_decoder_process_metadata(FLAC__FileDecoder *decoder)
FLAC__bool ret;
FLAC__ASSERT(decoder != 0);
if(decoder->private->stream_decoder->protected->state == FLAC__STREAM_DECODER_END_OF_STREAM)
decoder->protected->state = FLAC__FILE_DECODER_END_OF_FILE;
if(decoder->private_->stream_decoder->protected_->state == FLAC__STREAM_DECODER_END_OF_STREAM)
decoder->protected_->state = FLAC__FILE_DECODER_END_OF_FILE;
if(decoder->protected->state == FLAC__FILE_DECODER_END_OF_FILE)
if(decoder->protected_->state == FLAC__FILE_DECODER_END_OF_FILE)
return true;
FLAC__ASSERT(decoder->protected->state == FLAC__FILE_DECODER_OK);
FLAC__ASSERT(decoder->protected_->state == FLAC__FILE_DECODER_OK);
ret = FLAC__stream_decoder_process_metadata(decoder->private->stream_decoder);
ret = FLAC__stream_decoder_process_metadata(decoder->private_->stream_decoder);
if(!ret)
decoder->protected->state = FLAC__FILE_DECODER_STREAM_ERROR;
decoder->protected_->state = FLAC__FILE_DECODER_STREAM_ERROR;
return ret;
}
......@@ -318,17 +318,17 @@ FLAC__bool FLAC__file_decoder_process_one_frame(FLAC__FileDecoder *decoder)
FLAC__bool ret;
FLAC__ASSERT(decoder != 0);
if(decoder->private->stream_decoder->protected->state == FLAC__STREAM_DECODER_END_OF_STREAM)
decoder->protected->state = FLAC__FILE_DECODER_END_OF_FILE;
if(decoder->private_->stream_decoder->protected_->state == FLAC__STREAM_DECODER_END_OF_STREAM)
decoder->protected_->state = FLAC__FILE_DECODER_END_OF_FILE;
if(decoder->protected->state == FLAC__FILE_DECODER_END_OF_FILE)
if(decoder->protected_->state == FLAC__FILE_DECODER_END_OF_FILE)
return true;
FLAC__ASSERT(decoder->protected->state == FLAC__FILE_DECODER_OK);
FLAC__ASSERT(decoder->protected_->state == FLAC__FILE_DECODER_OK);
ret = FLAC__stream_decoder_process_one_frame(decoder->private->stream_decoder);
ret = FLAC__stream_decoder_process_one_frame(decoder->private_->stream_decoder);
if(!ret)
decoder->protected->state = FLAC__FILE_DECODER_STREAM_ERROR;
decoder->protected_->state = FLAC__FILE_DECODER_STREAM_ERROR;
return ret;
}
......@@ -338,17 +338,17 @@ FLAC__bool FLAC__file_decoder_process_remaining_frames(FLAC__FileDecoder *decode
FLAC__bool ret;
FLAC__ASSERT(decoder != 0);
if(decoder->private->stream_decoder->protected->state == FLAC__STREAM_DECODER_END_OF_STREAM)
decoder->protected->state = FLAC__FILE_DECODER_END_OF_FILE;
if(decoder->private_->stream_decoder->protected_->state == FLAC__STREAM_DECODER_END_OF_STREAM)
decoder->protected_->state = FLAC__FILE_DECODER_END_OF_FILE;
if(decoder->protected->state == FLAC__FILE_DECODER_END_OF_FILE)
if(decoder->protected_->state == FLAC__FILE_DECODER_END_OF_FILE)
return true;
FLAC__ASSERT(decoder->protected->state == FLAC__FILE_DECODER_OK);
FLAC__ASSERT(decoder->protected_->state == FLAC__FILE_DECODER_OK);
ret = FLAC__stream_decoder_process_remaining_frames(decoder->private->stream_decoder);
ret = FLAC__stream_decoder_process_remaining_frames(decoder->private_->stream_decoder);
if(!ret)
decoder->protected->state = FLAC__FILE_DECODER_STREAM_ERROR;
decoder->protected_->state = FLAC__FILE_DECODER_STREAM_ERROR;
return ret;
}
......@@ -365,39 +365,39 @@ FLAC__bool FLAC__file_decoder_seek_absolute(FLAC__FileDecoder *decoder, FLAC__ui
struct stat filestats;
FLAC__ASSERT(decoder != 0);
FLAC__ASSERT(decoder->protected->state == FLAC__FILE_DECODER_OK);
FLAC__ASSERT(decoder->protected_->state == FLAC__FILE_DECODER_OK);
if(decoder->private->filename == 0) { /* means the file is stdin... */
decoder->protected->state = FLAC__FILE_DECODER_SEEK_ERROR;
if(decoder->private_->filename == 0) { /* means the file is stdin... */
decoder->protected_->state = FLAC__FILE_DECODER_SEEK_ERROR;
return false;
}
decoder->protected->state = FLAC__FILE_DECODER_SEEKING;
decoder->protected_->state = FLAC__FILE_DECODER_SEEKING;
/* turn off md5 checking if a seek is attempted */
decoder->protected->md5_checking = false;
decoder->protected_->md5_checking = false;
if(!FLAC__stream_decoder_reset(decoder->private->stream_decoder)) {
decoder->protected->state = FLAC__FILE_DECODER_STREAM_ERROR;
if(!FLAC__stream_decoder_reset(decoder->private_->stream_decoder)) {
decoder->protected_->state = FLAC__FILE_DECODER_STREAM_ERROR;
return false;
}
/* get the file length */
if(stat(decoder->private->filename, &filestats) != 0) {
decoder->protected->state = FLAC__FILE_DECODER_SEEK_ERROR;
if(stat(decoder->private_->filename, &filestats) != 0) {
decoder->protected_->state = FLAC__FILE_DECODER_SEEK_ERROR;
return false;
}
filesize = filestats.st_size;
/* rewind */
if(0 != fseek(decoder->private->file, 0, SEEK_SET)) {
decoder->protected->state = FLAC__FILE_DECODER_SEEK_ERROR;
if(0 != fseek(decoder->private_->file, 0, SEEK_SET)) {
decoder->protected_->state = FLAC__FILE_DECODER_SEEK_ERROR;
return false;
}
if(!FLAC__stream_decoder_process_metadata(decoder->private->stream_decoder)) {
decoder->protected->state = FLAC__FILE_DECODER_STREAM_ERROR;
if(!FLAC__stream_decoder_process_metadata(decoder->private_->stream_decoder)) {
decoder->protected_->state = FLAC__FILE_DECODER_STREAM_ERROR;
return false;
}
if(sample > decoder->private->stream_info.total_samples) {
decoder->protected->state = FLAC__FILE_DECODER_SEEK_ERROR;
if(sample > decoder->private_->stream_info.total_samples) {
decoder->protected_->state = FLAC__FILE_DECODER_SEEK_ERROR;
return false;
}
......@@ -408,15 +408,15 @@ FLAC__StreamDecoderReadStatus read_callback_(const FLAC__StreamDecoder *decoder,
{
FLAC__FileDecoder *file_decoder = (FLAC__FileDecoder *)client_data;
(void)decoder;
if(feof(file_decoder->private->file)) {
file_decoder->protected->state = FLAC__FILE_DECODER_END_OF_FILE;
if(feof(file_decoder->private_->file)) {
file_decoder->protected_->state = FLAC__FILE_DECODER_END_OF_FILE;
return FLAC__STREAM_DECODER_READ_END_OF_STREAM;
}
else if(*bytes > 0) {
size_t bytes_read = fread(buffer, sizeof(FLAC__byte), *bytes, file_decoder->private->file);
size_t bytes_read = fread(buffer, sizeof(FLAC__byte), *bytes, file_decoder->private_->file);
if(bytes_read == 0) {
if(feof(file_decoder->private->file)) {
file_decoder->protected->state = FLAC__FILE_DECODER_END_OF_FILE;
if(feof(file_decoder->private_->file)) {
file_decoder->protected_->state = FLAC__FILE_DECODER_END_OF_FILE;
return FLAC__STREAM_DECODER_READ_END_OF_STREAM;
}
else
......@@ -436,32 +436,32 @@ FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__StreamDecoder *decode
FLAC__FileDecoder *file_decoder = (FLAC__FileDecoder *)client_data;
(void)decoder;
if(file_decoder->protected->state == FLAC__FILE_DECODER_SEEKING) {
if(file_decoder->protected_->state == FLAC__FILE_DECODER_SEEKING) {
FLAC__uint64 this_frame_sample = frame->header.number.sample_number;
FLAC__uint64 next_frame_sample = this_frame_sample + (FLAC__uint64)frame->header.blocksize;
FLAC__uint64 target_sample = file_decoder->private->target_sample;
FLAC__uint64 target_sample = file_decoder->private_->target_sample;
FLAC__ASSERT(frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER);
file_decoder->private->last_frame = *frame; /* save the frame in the private */
file_decoder->private_->last_frame = *frame; /* save the frame */
if(this_frame_sample <= target_sample && target_sample < next_frame_sample) { /* we hit our target frame */
unsigned delta = (unsigned)(target_sample - this_frame_sample);
/* kick out of seek mode */
file_decoder->protected->state = FLAC__FILE_DECODER_OK;
file_decoder->protected_->state = FLAC__FILE_DECODER_OK;
/* shift out the samples before target_sample */
if(delta > 0) {
unsigned channel;
const FLAC__int32 *newbuffer[FLAC__MAX_CHANNELS];
for(channel = 0; channel < frame->header.channels; channel++)
newbuffer[channel] = buffer[channel] + delta;
file_decoder->private->last_frame.header.blocksize -= delta;
file_decoder->private->last_frame.header.number.sample_number += (FLAC__uint64)delta;
file_decoder->private_->last_frame.header.blocksize -= delta;
file_decoder->private_->last_frame.header.number.sample_number += (FLAC__uint64)delta;
/* write the relevant samples */
return file_decoder->private->write_callback(file_decoder, &file_decoder->private->last_frame, newbuffer, file_decoder->private->client_data);
return file_decoder->private_->write_callback(file_decoder, &file_decoder->private_->last_frame, newbuffer, file_decoder->private_->client_data);
}
else {
/* write the relevant samples */
return file_decoder->private->write_callback(file_decoder, frame, buffer, file_decoder->private->client_data);
return file_decoder->private_->write_callback(file_decoder, frame, buffer, file_decoder->private_->client_data);
}
}
else {
......@@ -469,11 +469,11 @@ FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__StreamDecoder *decode
}
}
else {
if(file_decoder->protected->md5_checking) {
if(!FLAC__MD5Accumulate(&file_decoder->private->md5context, buffer, frame->header.channels, frame->header.blocksize, (frame->header.bits_per_sample+7) / 8))
if(file_decoder->protected_->md5_checking) {
if(!FLAC__MD5Accumulate(&file_decoder->private_->md5context, buffer, frame->header.channels, frame->header.blocksize, (frame->header.bits_per_sample+7) / 8))
return FLAC__STREAM_DECODER_WRITE_ABORT;
}
return file_decoder->private->write_callback(file_decoder, frame, buffer, file_decoder->private->client_data);
return file_decoder->private_->write_callback(file_decoder, frame, buffer, file_decoder->private_->client_data);
}
}
......@@ -483,18 +483,18 @@ void metadata_callback_(const FLAC__StreamDecoder *decoder, const FLAC__StreamMe
(void)decoder;
if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
file_decoder->private->stream_info = metadata->data.stream_info;
file_decoder->private_->stream_info = metadata->data.stream_info;
/* save the MD5 signature for comparison later */
memcpy(file_decoder->private->stored_md5sum, metadata->data.stream_info.md5sum, 16);
if(0 == memcmp(file_decoder->private->stored_md5sum, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16))
file_decoder->protected->md5_checking = false;
memcpy(file_decoder->private_->stored_md5sum, metadata->data.stream_info.md5sum, 16);
if(0 == memcmp(file_decoder->private_->stored_md5sum, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16))
file_decoder->protected_->md5_checking = false;
}
else if(metadata->type == FLAC__METADATA_TYPE_SEEKTABLE) {
file_decoder->private->seek_table = &metadata->data.seek_table;
file_decoder->private_->seek_table = &metadata->data.seek_table;
}
if(file_decoder->protected->state != FLAC__FILE_DECODER_SEEKING)
file_decoder->private->metadata_callback(file_decoder, metadata, file_decoder->private->client_data);
if(file_decoder->protected_->state != FLAC__FILE_DECODER_SEEKING)
file_decoder->private_->metadata_callback(file_decoder, metadata, file_decoder->private_->client_data);
}
void error_callback_(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
......@@ -502,8 +502,8 @@ void error_callback_(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErro
FLAC__FileDecoder *file_decoder = (FLAC__FileDecoder *)client_data;
(void)decoder;
if(file_decoder->protected->state != FLAC__FILE_DECODER_SEEKING)
file_decoder->private->error_callback(file_decoder, status, file_decoder->private->client_data);
if(file_decoder->protected_->state != FLAC__FILE_DECODER_SEEKING)
file_decoder->private_->error_callback(file_decoder, status, file_decoder->private_->client_data);
}
FLAC__bool seek_to_absolute_sample_(FLAC__FileDecoder *decoder, long filesize, FLAC__uint64 target_sample)
......@@ -514,18 +514,18 @@ FLAC__bool seek_to_absolute_sample_(FLAC__FileDecoder *decoder, long filesize, F
unsigned approx_bytes_per_frame;
FLAC__uint64 last_frame_sample = 0xffffffffffffffff;
FLAC__bool needs_seek;
const FLAC__bool is_variable_blocksize_stream = (decoder->private->stream_info.min_blocksize != decoder->private->stream_info.max_blocksize);
const FLAC__bool is_variable_blocksize_stream = (decoder->private_->stream_info.min_blocksize != decoder->private_->stream_info.max_blocksize);
/* we are just guessing here, but we want to guess high, not low */
if(decoder->private->stream_info.max_framesize > 0) {
approx_bytes_per_frame = decoder->private->stream_info.max_framesize;
if(decoder->private_->stream_info.max_framesize > 0) {
approx_bytes_per_frame = decoder->private_->stream_info.max_framesize;
}
else if(!is_variable_blocksize_stream) {
/* note there are no () around 'decoder->private->stream_info.bits_per_sample/8' to keep precision up since it's an integer calulation */
approx_bytes_per_frame = decoder->private->stream_info.min_blocksize * decoder->private->stream_info.channels * decoder->private->stream_info.bits_per_sample/8 + 64;
/* note there are no () around 'decoder->private_->stream_info.bits_per_sample/8' to keep precision up since it's an integer calulation */
approx_bytes_per_frame = decoder->private_->stream_info.min_blocksize * decoder->private_->stream_info.channels * decoder->private_->stream_info.bits_per_sample/8 + 64;
}
else
approx_bytes_per_frame = 1152 * decoder->private->stream_info.channels * decoder->private->stream_info.bits_per_sample/8 + 64;
approx_bytes_per_frame = 1152 * decoder->private_->stream_info.channels * decoder->private_->stream_info.bits_per_sample/8 + 64;
/*
* The file pointer is currently at the first frame plus any read
......@@ -533,11 +533,11 @@ FLAC__bool seek_to_absolute_sample_(FLAC__FileDecoder *decoder, long filesize, F
* uncomsumed bytes to get the position of the first frame in the
* file.
*/
if(-1 == (first_frame_offset = ftell(decoder->private->file))) {
decoder->protected->state = FLAC__FILE_DECODER_SEEK_ERROR;
if(-1 == (first_frame_offset = ftell(decoder->private_->file))) {
decoder->protected_->state = FLAC__FILE_DECODER_SEEK_ERROR;
return false;
}
first_frame_offset -= FLAC__stream_decoder_get_input_bytes_unconsumed(decoder->private->stream_decoder);
first_frame_offset -= FLAC__stream_decoder_get_input_bytes_unconsumed(decoder->private_->stream_decoder);
FLAC__ASSERT(first_frame_offset >= 0);
/*
......@@ -549,34 +549,34 @@ FLAC__bool seek_to_absolute_sample_(FLAC__FileDecoder *decoder, long filesize, F
lower_bound = first_frame_offset;
/* calc the upper_bound, beyond which we never want to seek */
if(decoder->private->stream_info.max_framesize > 0)
upper_bound = filesize - (decoder->private->stream_info.max_framesize + 128 + 2); /* 128 for a possible ID3V1 tag, 2 for indexing differences */
if(decoder->private_->stream_info.max_framesize > 0)
upper_bound = filesize - (decoder->private_->stream_info.max_framesize + 128 + 2); /* 128 for a possible ID3V1 tag, 2 for indexing differences */
else
upper_bound = filesize - ((decoder->private->stream_info.channels * decoder->private->stream_info.bits_per_sample * FLAC__MAX_BLOCK_SIZE) / 8 + 128 + 2);
upper_bound = filesize - ((decoder->private_->stream_info.channels * decoder->private_->stream_info.bits_per_sample * FLAC__MAX_BLOCK_SIZE) / 8 + 128 + 2);
/*
* Now we refine the bounds if we have a seektable with
* suitable points. Note that according to the spec they
* must be ordered by ascending sample number.
*/