[SCM] calf/master: Add missing overrides of MIDI-related virtual methods.

js at users.alioth.debian.org js at users.alioth.debian.org
Tue May 7 15:40:03 UTC 2013


The following commit has been merged in the master branch:
commit a4820091f671fa6d5ddd0fe1c32c10c169dab907
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Sat Apr 10 17:47:00 2010 +0100

    Add missing overrides of MIDI-related virtual methods.
    
    Previously the implementations from drawbar_organ were found because
    wrappers were templates. Currently, the MIDI callbacks are virtual
    methods so they need to be properly overridden in audio_module_iface
    implementation.

diff --git a/src/calf/organ.h b/src/calf/organ.h
index 3810660..721157d 100644
--- a/src/calf/organ.h
+++ b/src/calf/organ.h
@@ -306,10 +306,7 @@ public:
         srate = sr;
     }
     void params_changed();
-    inline void pitch_bend(int amt)
-    {
-        drawbar_organ::pitch_bend(amt);
-    }
+
     void activate();
     void deactivate();
     uint32_t process(uint32_t offset, uint32_t nsamples, uint32_t inputs_mask, uint32_t outputs_mask);
@@ -322,6 +319,12 @@ public:
     char *configure(const char *key, const char *value);
     void send_configures(send_configure_iface *);
     uint32_t message_run(const void *valid_inputs, void *output_ports);
+public:
+    // overrides
+    virtual void note_on(int note, int velocity) { dsp::drawbar_organ::note_on(note, velocity); }
+    virtual void note_off(int note, int velocity) { dsp::drawbar_organ::note_off(note, velocity); }
+    virtual void control_change(int controller, int value) { dsp::drawbar_organ::control_change(controller, value); }
+    virtual void pitch_bend(int value) { dsp::drawbar_organ::pitch_bend(value); }
 };
 
 };

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list