pcm_buffer: convert to C++
This commit is contained in:
@@ -39,13 +39,10 @@ flac_data::flac_data(struct decoder *_decoder,
|
||||
decoder(_decoder), input_stream(_input_stream),
|
||||
tag(nullptr)
|
||||
{
|
||||
pcm_buffer_init(&buffer);
|
||||
}
|
||||
|
||||
flac_data::~flac_data()
|
||||
{
|
||||
pcm_buffer_deinit(&buffer);
|
||||
|
||||
if (tag != nullptr)
|
||||
tag_free(tag);
|
||||
}
|
||||
@@ -178,7 +175,7 @@ flac_common_write(struct flac_data *data, const FLAC__Frame * frame,
|
||||
return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
|
||||
|
||||
size_t buffer_size = frame->header.blocksize * data->frame_size;
|
||||
buffer = pcm_buffer_get(&data->buffer, buffer_size);
|
||||
buffer = data->buffer.Get(buffer_size);
|
||||
|
||||
flac_convert(buffer, frame->header.channels,
|
||||
(enum sample_format)data->audio_format.format, buf,
|
||||
|
@@ -26,10 +26,7 @@
|
||||
|
||||
#include "FlacInput.hxx"
|
||||
#include "DecoderAPI.hxx"
|
||||
|
||||
extern "C" {
|
||||
#include "pcm/pcm_buffer.h"
|
||||
}
|
||||
#include "pcm/PcmBuffer.hxx"
|
||||
|
||||
#include <FLAC/stream_decoder.h>
|
||||
#include <FLAC/metadata.h>
|
||||
@@ -38,7 +35,7 @@ extern "C" {
|
||||
#define G_LOG_DOMAIN "flac"
|
||||
|
||||
struct flac_data : public FlacInput {
|
||||
struct pcm_buffer buffer;
|
||||
PcmBuffer buffer;
|
||||
|
||||
/**
|
||||
* The size of one frame in the output buffer.
|
||||
|
Reference in New Issue
Block a user