Merge commit 'origin/master' into fx-mixer-rework

plugins/ladspa_effect/calf/CMakeLists.txt

@@ -1,10 +1,10 @@
-FILE(GLOB SOURCES *.cpp)
+FILE(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 ADD_LIBRARY(calf MODULE ${SOURCES})
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/calf)
 INSTALL(TARGETS calf LIBRARY DESTINATION ${PLUGIN_DIR}/ladspa)
 ADD_DEFINITIONS(-DUSE_LADSPA=1)
 SET_TARGET_PROPERTIES(calf PROPERTIES PREFIX "")
-SET_TARGET_PROPERTIES(calf PROPERTIES COMPILE_FLAGS "-O2 -finline-limit=80 -funroll-loops")
+SET_TARGET_PROPERTIES(calf PROPERTIES COMPILE_FLAGS "-O2 -finline-limit=80 -finline-functions -finline-functions-called-once")
 
 IF(LMMS_BUILD_WIN32)
 	ADD_CUSTOM_COMMAND(TARGET calf POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/calf.dll)

plugins/ladspa_effect/calf/calf/modules_synths.h

@@ -110,39 +110,11 @@ public:
         inertia_pitchbend.set_inertia(pow(2.0, (value * *params[par_pwhlrange]) / (1200.0 * 8192.0)));
     }
     /// Update oscillator frequency based on base frequency, detune amount, pitch bend scaling factor and sample rate.
-    inline void set_frequency()
-    {
-        float detune_scaled = (detune - 1); // * log(freq / 440);
-        if (*params[par_scaledetune] > 0)
-            detune_scaled *= pow(20.0 / freq, *params[par_scaledetune]);
-        float p1 = 1, p2 = 1;
-        if (moddest[moddest_o1detune] != 0)
-            p1 = pow(2.0, moddest[moddest_o1detune] * (1.0 / 1200.0));
-        if (moddest[moddest_o2detune] != 0)
-            p2 = pow(2.0, moddest[moddest_o2detune] * (1.0 / 1200.0));
-        osc1.set_freq(freq * (1 - detune_scaled) * p1 * inertia_pitchbend.get_last() * lfo_bend, srate);
-        osc2.set_freq(freq * (1 + detune_scaled) * p2 * inertia_pitchbend.get_last() * lfo_bend * xpose, srate);
-    }
+    void set_frequency();
     /// Handle control change messages.
     void control_change(int controller, int value);
     /// Update variables from control ports.
-    void params_changed() {
-        float sf = 0.001f;
-        envelope.set(*params[par_attack] * sf, *params[par_decay] * sf, std::min(0.999f, *params[par_sustain]), *params[par_release] * sf, srate / step_size, *params[par_fade] * sf);
-        filter_type = dsp::fastf2i_drm(*params[par_filtertype]);
-        decay_factor = odcr * 1000.0 / *params[par_decay];
-        separation = pow(2.0, *params[par_cutoffsep] / 1200.0);
-        wave1 = dsp::clip(dsp::fastf2i_drm(*params[par_wave1]), 0, (int)wave_count - 1);
-        wave2 = dsp::clip(dsp::fastf2i_drm(*params[par_wave2]), 0, (int)wave_count - 1);
-        detune = pow(2.0, *params[par_detune] / 1200.0);
-        xpose = pow(2.0, *params[par_osc2xpose] / 12.0);
-        xfade = *params[par_oscmix];
-        legato = dsp::fastf2i_drm(*params[par_legato]);
-        master.set_inertia(*params[par_master]);
-        set_frequency();
-        if (wave1 != prev_wave1 || wave2 != prev_wave2)
-            lookup_waveforms();
-    }
+    void params_changed();
     void activate();
     void deactivate();
     void post_instantiate()

plugins/ladspa_effect/calf/calf/osc.h

@@ -146,7 +146,7 @@ struct bandlimiter
                 new_spec[SIZE - i] = 0.f;
         }
         // convert back to time domain (IFFT) and extract only real part
-        fft.calculate(new_spec.data(), iffted.data(), true);
+        fft.calculate(&new_spec.front(), &iffted.front(), true);
         for (int i = 0; i < SIZE; i++)
             output[i] = iffted[i].real();
     }
@@ -241,6 +241,10 @@ struct waveform_oscillator: public simple_oscillator
 {
     enum { SIZE = 1 << SIZE_BITS, MASK = SIZE - 1, SCALE = 1 << (32 - SIZE_BITS) };
     float *waveform;
+    waveform_oscillator()
+    {
+        waveform = NULL;
+    }
     inline float get()
     {
         uint32_t wpos = phase >> (32 - SIZE_BITS);

plugins/ladspa_effect/calf/src/monosynth.cpp

@@ -622,7 +622,43 @@ void monosynth_audio_module::deactivate()
     stack.clear();
 }
 
-uint32_t monosynth_audio_module::process(uint32_t offset, uint32_t nsamples, uint32_t inputs_mask, uint32_t outputs_mask) {
+void monosynth_audio_module::set_frequency()
+{
+    float detune_scaled = (detune - 1); // * log(freq / 440);
+    if (*params[par_scaledetune] > 0)
+        detune_scaled *= pow(20.0 / freq, *params[par_scaledetune]);
+    float p1 = 1, p2 = 1;
+    if (moddest[moddest_o1detune] != 0)
+        p1 = pow(2.0, moddest[moddest_o1detune] * (1.0 / 1200.0));
+    if (moddest[moddest_o2detune] != 0)
+        p2 = pow(2.0, moddest[moddest_o2detune] * (1.0 / 1200.0));
+    osc1.set_freq(freq * (1 - detune_scaled) * p1 * inertia_pitchbend.get_last() * lfo_bend, srate);
+    osc2.set_freq(freq * (1 + detune_scaled) * p2 * inertia_pitchbend.get_last() * lfo_bend * xpose, srate);
+}
+
+
+void monosynth_audio_module::params_changed()
+{
+    float sf = 0.001f;
+    envelope.set(*params[par_attack] * sf, *params[par_decay] * sf, std::min(0.999f, *params[par_sustain]), *params[par_release] * sf, srate / step_size, *params[par_fade] * sf);
+    filter_type = dsp::fastf2i_drm(*params[par_filtertype]);
+    decay_factor = odcr * 1000.0 / *params[par_decay];
+    separation = pow(2.0, *params[par_cutoffsep] / 1200.0);
+    wave1 = dsp::clip(dsp::fastf2i_drm(*params[par_wave1]), 0, (int)wave_count - 1);
+    wave2 = dsp::clip(dsp::fastf2i_drm(*params[par_wave2]), 0, (int)wave_count - 1);
+    detune = pow(2.0, *params[par_detune] / 1200.0);
+    xpose = pow(2.0, *params[par_osc2xpose] / 12.0);
+    xfade = *params[par_oscmix];
+    legato = dsp::fastf2i_drm(*params[par_legato]);
+    master.set_inertia(*params[par_master]);
+    set_frequency();
+    if (wave1 != prev_wave1 || wave2 != prev_wave2)
+        lookup_waveforms();
+}
+
+
+uint32_t monosynth_audio_module::process(uint32_t offset, uint32_t nsamples, uint32_t inputs_mask, uint32_t outputs_mask)
+{
     if (!running && queue_note_on == -1) {
         for (uint32_t i = 0; i < nsamples / step_size; i++)
             envelope.advance();

plugins/ladspa_effect/calf/src/organ.cpp

@@ -173,9 +173,10 @@ static void padsynth(bandlimiter<ORGAN_WAVE_BITS> blSrc, bandlimiter<ORGAN_BIG_W
     // same as above - put large array on heap to avoid stack overflow in ingen
     vector<float> tmp;
     tmp.resize(ORGAN_BIG_WAVE_SIZE);
-    blDest.compute_waveform(tmp.data());
-    normalize_waveform(tmp.data(), ORGAN_BIG_WAVE_SIZE);
-    blDest.compute_spectrum(tmp.data());
+    float *ptmp = &tmp.front();
+    blDest.compute_waveform(ptmp);
+    normalize_waveform(ptmp, ORGAN_BIG_WAVE_SIZE);
+    blDest.compute_spectrum(ptmp);
     
     // limit is 1/2 of the number of harmonics of the original wave
     result.make_from_spectrum(blDest, foldover, ORGAN_WAVE_SIZE >> (1 + ORGAN_BIG_WAVE_SHIFT));

plugins/midi_import/MidiImport.cpp

@@ -229,9 +229,11 @@ public:
 			if( it_inst )
 			{
 				isSF2 = true;
-				it_inst->loadResource(
-					configManager::inst()->
-						defaultSoundfont() );
+                if( configManager::inst()->defaultSoundfont() )
+                {
+                    it_inst->loadResource(
+                        configManager::inst()->defaultSoundfont() );
+                }
 				it_inst->childModel( "bank" )->setValue( 0 );
 				it_inst->childModel( "patch" )->setValue( 0 );
 			}