Skip to content

Commit b3c1e68

Browse files
michaelwillismichaelwillis
committed
Merge branch 'lv2-dry-level-fix'
2 parents 8f05170 + b0f002e commit b3c1e68

File tree

7 files changed

+42
-36
lines changed

7 files changed

+42
-36
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Dragonfly Reverb is a bundle of free audio effects for Linux, MacOS, and Windows
55

66
## Download
77

8-
* **[Linux](https://github.com/michaelwillis/dragonfly-reverb/releases/download/3.1.1/DragonflyReverb-Linux-64bit-v3.1.1.tgz)**
9-
* **[MacOS](https://github.com/michaelwillis/dragonfly-reverb/releases/download/3.1.1/DragonflyReverb-MacOS-64bit-v3.1.1.zip)**
10-
* **[Windows (32 bit)](https://github.com/michaelwillis/dragonfly-reverb/releases/download/3.1.1/DragonflyReverb-Windows-32bit-v3.1.1.zip)**
11-
* **[Windows (64 bit)](https://github.com/michaelwillis/dragonfly-reverb/releases/download/3.1.1/DragonflyReverb-Windows-64bit-v3.1.1.zip)**
8+
* **[Linux](https://github.com/michaelwillis/dragonfly-reverb/releases/download/3.1.2/DragonflyReverb-Linux-64bit-v3.1.2.tgz)**
9+
* **[MacOS](https://github.com/michaelwillis/dragonfly-reverb/releases/download/3.1.2/DragonflyReverb-MacOS-64bit-v3.1.2.zip)**
10+
* **[Windows (32 bit)](https://github.com/michaelwillis/dragonfly-reverb/releases/download/3.1.2/DragonflyReverb-Windows-32bit-v3.1.2.zip)**
11+
* **[Windows (64 bit)](https://github.com/michaelwillis/dragonfly-reverb/releases/download/3.1.2/DragonflyReverb-Windows-64bit-v3.1.2.zip)**
1212

1313
## Dependencies
1414

‎common/DragonflyVersion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616

1717
#define MAJOR_VERSION 3
1818
#define MINOR_VERSION 1
19-
#define PATCH_VERSION 1
19+
#define PATCH_VERSION 2
2020
#define VERSION_SUFFIX ""

‎docs/donations.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="header">
88
<a href="index.html"><img src="images/title.png" alt="Dragonfly Reverb" /></a>
99
<div class="navigation">
10-
<a href="https://github.com/michaelwillis/dragonfly-reverb/releases/tag/3.1.1">
10+
<a href="https://github.com/michaelwillis/dragonfly-reverb/releases/tag/3.1.2">
1111
<svg viewBox="-6 -2 16 16" height="32" width="36" aria-hidden="true"><path fill-rule="evenodd" d="M7 7V3H3v4H0l5 6 5-6H7z"></path></svg>
1212
Download
1313
</a>

‎docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="header">
88
<a href="index.html"><img src="images/title.png" alt="Dragonfly Reverb" /></a>
99
<div class="navigation">
10-
<a href="https://github.com/michaelwillis/dragonfly-reverb/releases/tag/3.1.1">
10+
<a href="https://github.com/michaelwillis/dragonfly-reverb/releases/tag/3.1.2">
1111
<svg viewBox="-6 -2 16 16" height="32" width="36" aria-hidden="true"><path fill-rule="evenodd" d="M7 7V3H3v4H0l5 6 5-6H7z"></path></svg>
1212
Download
1313
</a>

‎docs/manuals.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="header">
88
<a href="index.html"><img src="images/title.png" alt="Dragonfly Reverb" /></a>
99
<div class="navigation">
10-
<a href="https://github.com/michaelwillis/dragonfly-reverb/releases/tag/3.1.1">
10+
<a href="https://github.com/michaelwillis/dragonfly-reverb/releases/tag/3.1.2">
1111
<svg viewBox="-6 -2 16 16" height="32" width="36" aria-hidden="true"><path fill-rule="evenodd" d="M7 7V3H3v4H0l5 6 5-6H7z"></path></svg>
1212
Download
1313
</a>

‎plugins/dragonfly-hall-reverb/DSP.cpp

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -139,27 +139,31 @@ void DragonflyReverbDSP::run(const float** inputs, float** outputs, uint32_t fra
139139
}
140140

141141
for (uint32_t i = 0; i < buffer_frames; i++) {
142+
outputs[0][offset + i] = dry_level * inputs[0][offset + i];
143+
outputs[1][offset + i] = dry_level * inputs[1][offset + i];
144+
}
142145

143-
outputs[0][offset + i] = 0.0;
144-
outputs[1][offset + i] = 0.0;
145-
146-
if( dry_level > 0.0 ){
147-
outputs[0][offset + i] += dry_level * inputs[0][offset + i] ;
148-
outputs[1][offset + i] += dry_level * inputs[1][offset + i] ;
149-
}
150-
if( early_level > 0.0 ){
151-
outputs[0][offset + i] += early_level * early_out_buffer[0][i] ;
152-
outputs[1][offset + i] += early_level * early_out_buffer[1][i] ;
153-
}
154-
if( late_level > 0.0 ){
155-
outputs[0][offset + i] += late_level * late_out_buffer[0][i] ;
156-
outputs[1][offset + i] += late_level * late_out_buffer[1][i] ;
146+
if( early_level > 0.0 ){
147+
for (uint32_t i = 0; i < buffer_frames; i++) {
148+
outputs[0][offset + i] += early_level * early_out_buffer[0][i];
149+
outputs[1][offset + i] += early_level * early_out_buffer[1][i];
150+
}
151+
}
152+
153+
if( late_level > 0.0 ){
154+
for (uint32_t i = 0; i < buffer_frames; i++) {
155+
outputs[0][offset + i] += late_level * late_out_buffer[0][i];
156+
outputs[1][offset + i] += late_level * late_out_buffer[1][i];
157157
}
158+
}
158159

160+
for (uint32_t i = 0; i < buffer_frames; i++) {
159161
if (outputs[0][offset + i] != 0 || outputs[1][offset + i] != 0) {
160162
outputIdle = false;
163+
break;
161164
}
162165
}
166+
163167
}
164168
}
165169

‎plugins/dragonfly-room-reverb/DSP.cpp

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -140,27 +140,29 @@ void DragonflyReverbDSP::run(const float** inputs, float** outputs, uint32_t fra
140140
late_out_buffer[1],
141141
buffer_frames);
142142
}
143-
143+
144144
for (uint32_t i = 0; i < buffer_frames; i++) {
145-
outputs[0][offset + i] = 0.0 ;
146-
outputs[1][offset + i] = 0.0 ;
147-
148-
if( dry_level > 0.0 ){
149-
outputs[0][offset + i] += dry_level * inputs[0][offset + i] ;
150-
outputs[1][offset + i] += dry_level * inputs[1][offset + i] ;
151-
}
152-
if( early_level > 0.0 ){
153-
outputs[0][offset + i] += early_level * early_out_buffer[0][i] ;
154-
outputs[1][offset + i] += early_level * early_out_buffer[1][i] ;
145+
outputs[0][offset + i] = dry_level * inputs[0][offset + i];
146+
outputs[1][offset + i] = dry_level * inputs[1][offset + i];
147+
}
148+
149+
if( early_level > 0.0 ){
150+
for (uint32_t i = 0; i < buffer_frames; i++) {
151+
outputs[0][offset + i] += early_level * early_out_buffer[0][i];
152+
outputs[1][offset + i] += early_level * early_out_buffer[1][i];
155153
}
156-
if( late_level > 0.0 ){
157-
outputs[0][offset + i] += late_level * late_out_buffer[0][i] * LATE_GAIN ;
158-
outputs[1][offset + i] += late_level * late_out_buffer[1][i] * LATE_GAIN ;
154+
}
155+
156+
if( late_level > 0.0 ){
157+
for (uint32_t i = 0; i < buffer_frames; i++) {
158+
outputs[0][offset + i] += late_level * late_out_buffer[0][i];
159+
outputs[1][offset + i] += late_level * late_out_buffer[1][i];
159160
}
160161
}
161162
}
162163
}
163164

165+
164166
void DragonflyReverbDSP::sampleRateChanged(double newSampleRate) {
165167
sampleRate = newSampleRate;
166168
early.setSampleRate(newSampleRate);

0 commit comments

Comments
 (0)