Skip to content

Loading resources in gen~ #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
antisvin wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Loading resources in gen~ #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
757862f
Resource loading
antisvin Jul 2, 2022
7a9dabd
Don't erase buffer to preserve WAV data
antisvin Nov 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions GenSource/genlib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

#include "genlib.h"
#include "genlib_exportfunctions.h"
#include "Resource.h"
#include "WavFile.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h> // for memcpy
Expand Down Expand Up @@ -152,7 +154,7 @@ unsigned long systime_ticks(void)
// void operator delete[](void *p) { sysmem_freeptr(p); }

void * genlib_obtain_reference_from_string(const char * name) {
return 0; // to be implemented
return (void*)Resource::load(name);
}

// the rest is stuff to isolate gensym, attrs, atoms, buffers etc.
Expand Down Expand Up @@ -217,6 +219,19 @@ t_genlib_data * genlib_obtain_data_from_reference(void *ref)
self->info.channels = 0;
self->info.data = 0;
self->cursor = 0;
if (ref != 0) {
Resource* resource = (Resource*)ref;
WavFile wav(resource->getData(), resource->getSize());
if (wav.isValid()) {
self->info.dim = wav.getNumberOfSamples();
self->info.channels = wav.getNumberOfChannels();
self->info.data = wav.createFloatArray().getData();
self->cursor = 0;
// debugMessage("Num samples = ", (int)self->info.dim);
// debugMessage("Num channels = ", (int)self->info.channels);
}
Resource::destroy(resource);
}
return (t_genlib_data *)self;
}

Expand Down Expand Up @@ -282,11 +297,13 @@ void genlib_data_resize(t_genlib_data *b, long s, long c) {
self->info.channels = c;
}

set_zero64(self->info.data, s * c);
// This erases the buffer, but it seems to be a bug. If enabled,
// old buffer contents is lost. This prevents correct WAV file playback.
//set_zero64(self->info.data, s * c);
return;

} else {

// allocate new:
replaced = (t_sample *)sysmem_newptr(sz);

Expand Down
19 changes: 12 additions & 7 deletions LibSource/WavFile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class WavFile {
void* getData(){
return datachunk->id + sizeof(WavDataChunk);
}
void read(size_t channel, FloatArray output){
void read(size_t channel, FloatArray output, bool all=false){
size_t channels = getNumberOfChannels();
size_t len = getNumberOfSamples();
if(len > output.getSize())
Expand All @@ -87,14 +87,14 @@ class WavFile {
if(header->audio_format == 1 && header->bps == 8){ // WAVE_FORMAT_PCM 8-bit
int8_t* data = (int8_t*)getData();
for(size_t i=0; i<len; ++i){
output[i] = (float)data[pos] / 128.0f;
pos += channels;
output[i] = (float)data[pos] / 128.0f;
pos += all ? 1 : channels;
}
}else if(header->audio_format == 1 && header->bps == 16){ // WAVE_FORMAT_PCM 16-bit
int16_t* data = (int16_t*)getData();
for(size_t i=0; i<len; ++i){
output[i] = (float)data[pos] / 32768.0f;
pos += channels;
output[i] = (float)data[pos] / 32768.0f;
pos += all ? 1 : channels;
}
// todo: 24-bit data needs decoding
// }else if(header->audio_format == 1 && header->bps == 24){ // WAVE_FORMAT_PCM 24-bit
Expand All @@ -106,8 +106,8 @@ class WavFile {
}else if(header->audio_format == 3 && header->bps == 32){ // WAVE_FORMAT_IEEE_FLOAT
float* data = (float*)getData();
for(size_t i=0; i<len; ++i){
output[i] = data[pos];
pos += channels;
output[i] = data[pos];
pos += all ? 1 : channels;
}
}
}
Expand All @@ -116,6 +116,11 @@ class WavFile {
read(channel, output);
return output;
}
FloatArray createFloatArray(){
FloatArray output = FloatArray::create(getNumberOfSamples() * getNumberOfChannels());
read(0, output, true);
return output;
}
};

#endif // __WavFile_h__