Rx3/drmr2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct offset

Browse Source
This commit is contained in:
falkTX 2016-07-17 15:25:51 +02:00
parent a26418b7f4
commit 8fac001331
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drmr.c
View File

@ -244,8 +244,9 @@ static inline void trigger_sample(DrMr *drmr, int nn, uint8_t* const data, uint3
build_midi_info_message(drmr,data); build_midi_info_message(drmr,data);
} }
drmr->samples[nn].active = 1; drmr->samples[nn].active = 1;
drmr->samples[nn].offset = offset; drmr->samples[nn].offset = 0;
drmr->samples[nn].velocity = drmr->ignore_velocity?1.0f:((float)data[2])/VELOCITY_MAX; drmr->samples[nn].velocity = drmr->ignore_velocity?1.0f:((float)data[2])/VELOCITY_MAX;
drmr->samples[nn].dataoffset = offset;
} }
pthread_mutex_unlock(&drmr->load_mutex); pthread_mutex_unlock(&drmr->load_mutex);
} }
@ -259,7 +260,8 @@ static inline void untrigger_sample(DrMr *drmr, int nn, uint32_t offset) {
fprintf(stderr,"Failed to find layer at: %i for %f\n",nn,*drmr->gains[nn]); fprintf(stderr,"Failed to find layer at: %i for %f\n",nn,*drmr->gains[nn]);
} }
drmr->samples[nn].active = 0; drmr->samples[nn].active = 0;
drmr->samples[nn].offset = offset; drmr->samples[nn].offset = 0;
drmr->samples[nn].dataoffset = offset;
} }
pthread_mutex_unlock(&drmr->load_mutex); pthread_mutex_unlock(&drmr->load_mutex);
} }
@ -378,7 +380,7 @@ static void run(LV2_Handle instance, uint32_t n_samples) {
for (i = 0;i < drmr->num_samples;i++) { for (i = 0;i < drmr->num_samples;i++) {
int pos,lim; int pos,lim;
drmr_sample* cs = drmr->samples+i; drmr_sample* cs = drmr->samples+i;
if (cs->active && (cs->limit > 0)) { if ((cs->active || cs->dataoffset) && (cs->limit > 0)) {
float coef_right, coef_left; float coef_right, coef_left;
if (i < 32) { if (i < 32) {
float gain = DB_CO(*(drmr->gains[i])); float gain = DB_CO(*(drmr->gains[i]));
@ -390,10 +392,12 @@ static void run(LV2_Handle instance, uint32_t n_samples) {
else { else {
coef_right = coef_left = 1.0f; coef_right = coef_left = 1.0f;
} }
uint32_t dataoffset = cs->dataoffset;
cs->dataoffset = 0;
if (cs->info->channels == 1) { // play mono sample if (cs->info->channels == 1) { // play mono sample
lim = (n_samples < (cs->limit - cs->offset)?n_samples:(cs->limit-cs->offset)); lim = (n_samples < (cs->limit - cs->offset)?n_samples:(cs->limit-cs->offset));
for(pos = 0;pos < lim;pos++) { for(pos = dataoffset; pos < lim; pos++) {
drmr->left[pos] += cs->data[cs->offset]*coef_left; drmr->left[pos] += cs->data[cs->offset]*coef_left;
drmr->right[pos] += cs->data[cs->offset]*coef_right; drmr->right[pos] += cs->data[cs->offset]*coef_right;
cs->offset++; cs->offset++;
@ -401,7 +405,7 @@ static void run(LV2_Handle instance, uint32_t n_samples) {
} else { // play stereo sample } else { // play stereo sample
lim = (cs->limit-cs->offset)/cs->info->channels; lim = (cs->limit-cs->offset)/cs->info->channels;
if (lim > n_samples) lim = n_samples; if (lim > n_samples) lim = n_samples;
for (pos=0;pos<lim;pos++) { for (pos = dataoffset; pos < lim; pos++) {
drmr->left[pos] += cs->data[cs->offset++]*coef_left; drmr->left[pos] += cs->data[cs->offset++]*coef_left;
drmr->right[pos] += cs->data[cs->offset++]*coef_right; drmr->right[pos] += cs->data[cs->offset++]*coef_right;
} }

1
drmr.h
View File

@ -61,6 +61,7 @@ typedef struct {
float velocity; float velocity;
drmr_layer *layers; drmr_layer *layers;
float* data; float* data;
uint32_t dataoffset;
} drmr_sample; } drmr_sample;
// lv2 stuff // lv2 stuff