mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-15 19:52:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Linux compile.

Browse Source
This commit is contained in:
casey langen 2016-12-13 21:26:32 -08:00
parent e299c2a98e
commit dff09255a7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/contrib/nomaddecoder/NomadDecoder.cpp
View File

@ -36,7 +36,7 @@
using namespace musik::core::sdk;
#define DEFAULT_READ_SAMPLE_SIZE 2304
#define DEFAULT_READ_SAMPLE_SIZE 2304 * 4
static ssize_t nomadRead(void *datasource, void *buffer, size_t count) {
IDataStream *stream = static_cast<IDataStream*>(datasource);
@ -65,7 +65,7 @@ static int nomadClose(void *datasource) {
}
NomadDecoder::NomadDecoder() {
this->nomad = nullptr;
this->nomadContext = nullptr;
this->callbacks.read = &nomadRead;
this->callbacks.lseek = &nomadSeek;
this->callbacks.close = &nomadClose;
@ -75,20 +75,20 @@ NomadDecoder::~NomadDecoder() {
}
void NomadDecoder::Destroy() {
nomad_close(this->nomad);
this->nomad = nullptr;
nomad_close(this->nomadContext);
this->nomadContext = nullptr;
delete this;
}
double NomadDecoder::SetPosition(double seconds) {
return !nomad_time_seek(this->nomad, seconds) ? seconds : -1;
return !nomad_time_seek(this->nomadContext, seconds) ? seconds : -1;
}
bool NomadDecoder::GetBuffer(IBuffer *buffer) {
buffer->SetSamples(DEFAULT_READ_SAMPLE_SIZE);
int read = nomad_read(
this->nomad,
this->nomadContext,
(char *)buffer->BufferPointer(),
DEFAULT_READ_SAMPLE_SIZE,
SAMPLE_FORMAT_32_BIT_FLOAT);
@ -99,6 +99,6 @@ bool NomadDecoder::GetBuffer(IBuffer *buffer) {
}
bool NomadDecoder::Open(IDataStream *stream) {
int result = nomad_open_callbacks(&this->nomad, stream, &this->callbacks);
int result = nomad_open_callbacks(&this->nomadContext, stream, &this->callbacks);
return result ? false : true;
}

2
src/contrib/nomaddecoder/NomadDecoder.h
View File

@ -53,5 +53,5 @@ class NomadDecoder : public musik::core::sdk::IDecoder {
private:
nomad_callbacks callbacks;
nomad *nomad;
nomad *nomadContext;
};