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

Be a bit less clever but more correct about copying sample data

Browse Source
This commit is contained in:
Nick Lanham 2012-02-07 21:25:43 +01:00
parent cd1e3f90b3
commit 7e857abd89
1 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drmr.c
View File

@ -211,7 +211,6 @@ static void activate(LV2_Handle instance) { }
static void run(LV2_Handle instance, uint32_t n_samples) { static void run(LV2_Handle instance, uint32_t n_samples) {
int i,kitInt; int i,kitInt;
char first_active, one_active;
DrMr* drmr = (DrMr*)instance; DrMr* drmr = (DrMr*)instance;
kitInt = (int)floorf(*(drmr->kitReq)); kitInt = (int)floorf(*(drmr->kitReq));
@ -251,7 +250,11 @@ static void run(LV2_Handle instance, uint32_t n_samples) {
} }
} }
first_active = 1; for(i = 0;i<n_samples;i++) {
drmr->left[i] = 0.0f;
drmr->right[i] = 0.0f;
}
pthread_mutex_lock(&drmr->load_mutex); pthread_mutex_lock(&drmr->load_mutex);
for (i = 0;i < drmr->num_samples;i++) { for (i = 0;i < drmr->num_samples;i++) {
int pos,lim; int pos,lim;
@ -262,50 +265,25 @@ static void run(LV2_Handle instance, uint32_t n_samples) {
gain = *(drmr->gains[i]); gain = *(drmr->gains[i]);
else else
gain = 1.0f; gain = 1.0f;
one_active = 1;
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));
if (first_active) {
for(pos = 0;pos < lim;pos++) {
drmr->left[pos] = cs->data[cs->offset]*gain;
drmr->right[pos] = cs->data[cs->offset]*gain;
cs->offset++;
}
first_active = 0;
} else {
for(pos = 0;pos < lim;pos++) { for(pos = 0;pos < lim;pos++) {
drmr->left[pos] += cs->data[cs->offset]*gain; drmr->left[pos] += cs->data[cs->offset]*gain;
drmr->right[pos] += cs->data[cs->offset]*gain; drmr->right[pos] += cs->data[cs->offset]*gain;
cs->offset++; cs->offset++;
} }
}
} 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;
if (first_active) {
for (pos=0;pos<lim;pos++) {
drmr->left[pos] = cs->data[cs->offset++]*gain;
drmr->right[pos] = cs->data[cs->offset++]*gain;
}
first_active = 0;
} else {
for (pos=0;pos<lim;pos++) { for (pos=0;pos<lim;pos++) {
drmr->left[pos] += cs->data[cs->offset++]*gain; drmr->left[pos] += cs->data[cs->offset++]*gain;
drmr->right[pos] += cs->data[cs->offset++]*gain; drmr->right[pos] += cs->data[cs->offset++]*gain;
} }
} }
}
if (cs->offset >= cs->limit) cs->active = 0; if (cs->offset >= cs->limit) cs->active = 0;
} }
} }
pthread_mutex_unlock(&drmr->load_mutex); pthread_mutex_unlock(&drmr->load_mutex);
if (first_active) { // didn't find any samples
int pos;
for(pos = 0;pos<n_samples;pos++) {
drmr->left[pos] = 0.0f;
drmr->right[pos] = 0.0f;
}
}
} }
static void deactivate(LV2_Handle instance) {} static void deactivate(LV2_Handle instance) {}