[SCM] calf/master: all get_graph with mode

js at users.alioth.debian.org js at users.alioth.debian.org
Tue May 7 15:41:02 UTC 2013


The following commit has been merged in the master branch:
commit 642407621aa132f98e938f842322ca292861c167
Author: Markus Schmidt <schmidt at boomshop.net>
Date:   Tue Mar 6 13:35:22 2012 +0100

    all get_graph with mode

diff --git a/src/audio_fx.cpp b/src/audio_fx.cpp
index 139c090..6fe0835 100644
--- a/src/audio_fx.cpp
+++ b/src/audio_fx.cpp
@@ -512,7 +512,7 @@ void simple_lfo::set_params(float f, int m, float o, uint32_t sr, float a)
     amount = a;
 }
 
-bool simple_lfo::get_graph(float *data, int points, cairo_iface *context) const
+bool simple_lfo::get_graph(float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active)
         return false;
diff --git a/src/calf/audio_fx.h b/src/calf/audio_fx.h
index e2032e2..0f8801c 100644
--- a/src/calf/audio_fx.h
+++ b/src/calf/audio_fx.h
@@ -561,7 +561,7 @@ public:
     void activate();
     void deactivate();
     float get_value_from_phase(float ph, float off) const;
-    bool get_graph(float *data, int points, calf_plugins::cairo_iface *context) const;
+    bool get_graph(float *data, int points, calf_plugins::cairo_iface *context, int *mode) const;
     bool get_dot(float &x, float &y, int &size, calf_plugins::cairo_iface *context) const;
 };
 
diff --git a/src/calf/modules.h b/src/calf/modules.h
index c8b4cdd..bcd0844 100644
--- a/src/calf/modules.h
+++ b/src/calf/modules.h
@@ -206,7 +206,7 @@ public:
         inertia_filter_module::params_changed(); 
     }
         
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     int get_changed_offsets(int index, int generation, int &subindex_graph, int &subindex_dot, int &subindex_gridline) const;
 };
 
@@ -236,7 +236,7 @@ public:
     virtual void note_on(int channel, int note, int vel);
     virtual void note_off(int channel, int note, int vel);
     
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     
 private:
     void adjust_gain_according_to_filter_mode(int velocity);
diff --git a/src/calf/modules_comp.h b/src/calf/modules_comp.h
index decdf20..09626b6 100644
--- a/src/calf/modules_comp.h
+++ b/src/calf/modules_comp.h
@@ -59,7 +59,7 @@ public:
     void set_sample_rate(uint32_t sr);
     float get_output_level();
     float get_comp_level();
-    bool get_graph(int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     bool get_dot(int subindex, float &x, float &y, int &size, cairo_iface *context) const;
     bool get_gridline(int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
     int  get_changed_offsets(int generation, int &subindex_graph, int &subindex_dot, int &subindex_gridline) const;
@@ -89,7 +89,7 @@ public:
     void set_sample_rate(uint32_t sr);
     float get_output_level();
     float get_expander_level();
-    bool get_graph(int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     bool get_dot(int subindex, float &x, float &y, int &size, cairo_iface *context) const;
     bool get_gridline(int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
     int  get_changed_offsets(int generation, int &subindex_graph, int &subindex_dot, int &subindex_gridline) const;
@@ -112,7 +112,7 @@ public:
     void params_changed();
     void set_sample_rate(uint32_t sr);
     uint32_t process(uint32_t offset, uint32_t numsamples, uint32_t inputs_mask, uint32_t outputs_mask);
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     bool get_dot(int index, int subindex, float &x, float &y, int &size, cairo_iface *context) const;
     bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
     int  get_changed_offsets(int index, int generation, int &subindex_graph, int &subindex_dot, int &subindex_gridline) const;
@@ -160,7 +160,7 @@ public:
     float freq_gain(int index, double freq, uint32_t sr) const;
     void set_sample_rate(uint32_t sr);
     uint32_t process(uint32_t offset, uint32_t numsamples, uint32_t inputs_mask, uint32_t outputs_mask);
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     bool get_dot(int index, int subindex, float &x, float &y, int &size, cairo_iface *context) const;
     bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
     int  get_changed_offsets(int index, int generation, int &subindex_graph, int &subindex_dot, int &subindex_gridline) const;
@@ -189,7 +189,7 @@ public:
     uint32_t process(uint32_t offset, uint32_t numsamples, uint32_t inputs_mask, uint32_t outputs_mask);
     void set_sample_rate(uint32_t sr);
     const gain_reduction_audio_module *get_strip_by_param_index(int index) const;
-    virtual bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    virtual bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     virtual bool get_dot(int index, int subindex, float &x, float &y, int &size, cairo_iface *context) const;
     virtual bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
     virtual int  get_changed_offsets(int index, int generation, int &subindex_graph, int &subindex_dot, int &subindex_gridline) const;
@@ -223,7 +223,7 @@ public:
     }
     void set_sample_rate(uint32_t sr);
     uint32_t process(uint32_t offset, uint32_t numsamples, uint32_t inputs_mask, uint32_t outputs_mask);
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
     int  get_changed_offsets(int index, int generation, int &subindex_graph, int &subindex_dot, int &subindex_gridline) const;
 };
@@ -245,7 +245,7 @@ public:
     void params_changed();
     void set_sample_rate(uint32_t sr);
     uint32_t process(uint32_t offset, uint32_t numsamples, uint32_t inputs_mask, uint32_t outputs_mask);
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     bool get_dot(int index, int subindex, float &x, float &y, int &size, cairo_iface *context) const;
     bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
     int  get_changed_offsets(int index, int generation, int &subindex_graph, int &subindex_dot, int &subindex_gridline) const;
@@ -293,7 +293,7 @@ public:
     float freq_gain(int index, double freq, uint32_t sr) const;
     void set_sample_rate(uint32_t sr);
     uint32_t process(uint32_t offset, uint32_t numsamples, uint32_t inputs_mask, uint32_t outputs_mask);
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     bool get_dot(int index, int subindex, float &x, float &y, int &size, cairo_iface *context) const;
     bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
     int  get_changed_offsets(int index, int generation, int &subindex_graph, int &subindex_dot, int &subindex_gridline) const;
@@ -323,7 +323,7 @@ public:
     uint32_t process(uint32_t offset, uint32_t numsamples, uint32_t inputs_mask, uint32_t outputs_mask);
     void set_sample_rate(uint32_t sr);
     const expander_audio_module *get_strip_by_param_index(int index) const;
-    virtual bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    virtual bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     virtual bool get_dot(int index, int subindex, float &x, float &y, int &size, cairo_iface *context) const;
     virtual bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
     virtual int  get_changed_offsets(int index, int generation, int &subindex_graph, int &subindex_dot, int &subindex_gridline) const;
diff --git a/src/calf/modules_eq.h b/src/calf/modules_eq.h
index 61c6c28..e06781f 100644
--- a/src/calf/modules_eq.h
+++ b/src/calf/modules_eq.h
@@ -76,7 +76,7 @@ public:
         meters.set_sample_rate(sr);
     }
     uint32_t process(uint32_t offset, uint32_t numsamples, uint32_t inputs_mask, uint32_t outputs_mask);
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
     int  get_changed_offsets(int index, int generation, int &subindex_graph, int &subindex_dot, int &subindex_gridline) const;
 };
diff --git a/src/calf/modules_limit.h b/src/calf/modules_limit.h
index 29a61ba..5213ae3 100644
--- a/src/calf/modules_limit.h
+++ b/src/calf/modules_limit.h
@@ -89,7 +89,7 @@ public:
     void params_changed();
     uint32_t process(uint32_t offset, uint32_t numsamples, uint32_t inputs_mask, uint32_t outputs_mask);
     void set_sample_rate(uint32_t sr);
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
 };
 
diff --git a/src/calf/modules_mod.h b/src/calf/modules_mod.h
index bee6d37..5a90b9f 100644
--- a/src/calf/modules_mod.h
+++ b/src/calf/modules_mod.h
@@ -54,7 +54,7 @@ public:
         right.process(outs[1] + offset, ins[1] + offset, nsamples);
         return outputs_mask; // XXXKF allow some delay after input going blank
     }
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     float freq_gain(int subindex, float freq, float srate) const;
 };
 
@@ -80,7 +80,7 @@ public:
         right.process(outs[1] + offset, ins[1] + offset, nsamples);
         return outputs_mask; // XXXKF allow some delay after input going blank
     }
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
     float freq_gain(int subindex, float freq, float srate) const;
 };
@@ -148,7 +148,7 @@ public:
     void activate();
     void deactivate();
     void set_sample_rate(uint32_t sr);
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     float freq_gain(int subindex, float freq, float srate) const;
     bool get_dot(int index, int subindex, float &x, float &y, int &size, cairo_iface *context) const;
     bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
@@ -180,7 +180,7 @@ public:
         }
     }
     uint32_t process(uint32_t offset, uint32_t numsamples, uint32_t inputs_mask, uint32_t outputs_mask);
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     bool get_dot(int index, int subindex, float &x, float &y, int &size, cairo_iface *context) const;
     bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
 };
diff --git a/src/calf/modules_synths.h b/src/calf/modules_synths.h
index 1611668..dc57d60 100644
--- a/src/calf/modules_synths.h
+++ b/src/calf/modules_synths.h
@@ -160,7 +160,7 @@ public:
     /// Run two filters (one per channel) to produce stereo output samples.
     void calculate_buffer_stereo();
     /// Retrieve filter graph (which is 'live' so it cannot be generated by get_static_graph), or fall back to get_static_graph.
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     /// @retval true if the filter 1 is to be used for the left channel and filter 2 for the right channel
     /// @retval false if filters are to be connected in series and sent (mono) to both channels    
     inline bool is_stereo_filter() const
diff --git a/src/calf/organ.h b/src/calf/organ.h
index fe830b1..8eb32e4 100644
--- a/src/calf/organ.h
+++ b/src/calf/organ.h
@@ -342,7 +342,7 @@ public:
     /// Practically all the stuff here is noisy
     bool is_noisy(int param_no) { return true; }
     void execute(int cmd_no);
-    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const;
+    bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const;
     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);
diff --git a/src/custom_ctl.cpp b/src/custom_ctl.cpp
index ea83a79..d79da9b 100644
--- a/src/custom_ctl.cpp
+++ b/src/custom_ctl.cpp
@@ -76,7 +76,7 @@ calf_line_graph_draw_grid( cairo_t *c, std::string &legend, bool vertical, float
 }
 
 static void
-calf_line_graph_draw_graph( cairo_t *c, float *data, int sx, int sy, int mode )
+calf_line_graph_draw_graph( cairo_t *c, float *data, int sx, int sy, int mode = 0 )
 {
     int ox=5, oy=5;
     int _last = 0;
@@ -262,6 +262,7 @@ calf_line_graph_expose (GtkWidget *widget, GdkEventExpose *event)
             cairo_set_source_rgba(cache_cr, 0.15, 0.2, 0.0, 0.5);
             cairo_set_line_join(cache_cr, CAIRO_LINE_JOIN_MITER);
             cairo_set_line_width(cache_cr, 1);
+            lg->mode = 0;
             for(graph_n = 0; (graph_n<cache_graph_index) && lg->source->get_graph(lg->source_id, graph_n, data, sx, &cache_cimpl, &lg->mode); graph_n++)
             {
                 calf_line_graph_draw_graph( cache_cr, data, sx, sy, lg->mode );
@@ -307,6 +308,7 @@ calf_line_graph_expose (GtkWidget *widget, GdkEventExpose *event)
         cairo_set_source_rgba(cache_cr, 0.15, 0.2, 0.0, 0.5);
         cairo_set_line_join(cache_cr, CAIRO_LINE_JOIN_MITER);
         cairo_set_line_width(cache_cr, 1);
+        lg->mode = 0;
         for(int gn = graph_n; lg->source->get_graph(lg->source_id, gn, data, sx, &cache_cimpl, &lg->mode); gn++)
         {
             calf_line_graph_draw_graph( cache_cr, data, sx, sy, lg->mode );
@@ -408,6 +410,7 @@ calf_line_graph_init (CalfLineGraph *self)
     widget->requisition.height = 40;
     self->cache_surface = NULL;
     self->last_generation = 0;
+    self->mode = 0;
 }
 
 GtkWidget *
diff --git a/src/modules.cpp b/src/modules.cpp
index ec74091..952776f 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -306,7 +306,7 @@ uint32_t vintage_delay_audio_module::process(uint32_t offset, uint32_t numsample
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-bool filter_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool filter_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active)
         return false;
@@ -436,7 +436,7 @@ void filterclavier_audio_module::adjust_gain_according_to_filter_mode(int veloci
     }
 }
 
-bool filterclavier_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool filterclavier_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active || index != par_mode) {
         return false;
diff --git a/src/modules_comp.cpp b/src/modules_comp.cpp
index 8579770..c6f02c2 100644
--- a/src/modules_comp.cpp
+++ b/src/modules_comp.cpp
@@ -357,11 +357,11 @@ const gain_reduction_audio_module *multibandcompressor_audio_module::get_strip_b
     return NULL;
 }
 
-bool multibandcompressor_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool multibandcompressor_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     const gain_reduction_audio_module *m = get_strip_by_param_index(index);
     if (m)
-        return m->get_graph(subindex, data, points, context);
+        return m->get_graph(subindex, data, points, context, mode);
     return false;
 }
 
@@ -488,11 +488,11 @@ uint32_t compressor_audio_module::process(uint32_t offset, uint32_t numsamples,
     // whatever has to be returned x)
     return outputs_mask;
 }
-bool compressor_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool compressor_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active)
         return false;
-    return compressor.get_graph(subindex, data, points, context);
+    return compressor.get_graph(subindex, data, points, context, mode);
 }
 
 bool compressor_audio_module::get_dot(int index, int subindex, float &x, float &y, int &size, cairo_iface *context) const
@@ -865,7 +865,7 @@ uint32_t sidechaincompressor_audio_module::process(uint32_t offset, uint32_t num
     // whatever has to be returned x)
     return outputs_mask;
 }
-bool sidechaincompressor_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool sidechaincompressor_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active)
         return false;
@@ -873,7 +873,7 @@ bool sidechaincompressor_audio_module::get_graph(int index, int subindex, float
         context->set_line_width(1.5);
         return ::get_graph(*this, subindex, data, points);
     } else if(index == param_compression) {
-        return compressor.get_graph(subindex, data, points, context);
+        return compressor.get_graph(subindex, data, points, context, mode);
     }
     return false;
 }
@@ -1127,7 +1127,7 @@ uint32_t deesser_audio_module::process(uint32_t offset, uint32_t numsamples, uin
     // whatever has to be returned x)
     return outputs_mask;
 }
-bool deesser_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool deesser_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active)
         return false;
@@ -1277,11 +1277,11 @@ uint32_t gate_audio_module::process(uint32_t offset, uint32_t numsamples, uint32
     // whatever has to be returned x)
     return outputs_mask;
 }
-bool gate_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool gate_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active)
         return false;
-    return gate.get_graph(subindex, data, points, context);
+    return gate.get_graph(subindex, data, points, context, mode);
 }
 
 bool gate_audio_module::get_dot(int index, int subindex, float &x, float &y, int &size, cairo_iface *context) const
@@ -1652,7 +1652,7 @@ uint32_t sidechaingate_audio_module::process(uint32_t offset, uint32_t numsample
     // whatever has to be returned x)
     return outputs_mask;
 }
-bool sidechaingate_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool sidechaingate_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active)
         return false;
@@ -1660,7 +1660,7 @@ bool sidechaingate_audio_module::get_graph(int index, int subindex, float *data,
         context->set_line_width(1.5);
         return ::get_graph(*this, subindex, data, points);
     } else if(index == param_gating) {
-        return gate.get_graph(subindex, data, points, context);
+        return gate.get_graph(subindex, data, points, context, mode);
     }
     return false;
 }
@@ -2052,11 +2052,11 @@ const expander_audio_module *multibandgate_audio_module::get_strip_by_param_inde
     return NULL;
 }
 
-bool multibandgate_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool multibandgate_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     const expander_audio_module *m = get_strip_by_param_index(index);
     if (m)
-        return m->get_graph(subindex, data, points, context);
+        return m->get_graph(subindex, data, points, context, mode);
     return false;
 }
 
@@ -2244,7 +2244,7 @@ float gain_reduction_audio_module::get_comp_level() {
     return meter_comp;
 }
 
-bool gain_reduction_audio_module::get_graph(int subindex, float *data, int points, cairo_iface *context) const
+bool gain_reduction_audio_module::get_graph(int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active)
         return false;
@@ -2490,7 +2490,7 @@ float expander_audio_module::get_expander_level() {
     return meter_gate;
 }
 
-bool expander_audio_module::get_graph(int subindex, float *data, int points, cairo_iface *context) const
+bool expander_audio_module::get_graph(int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active)
         return false;
diff --git a/src/modules_eq.cpp b/src/modules_eq.cpp
index 177b7fa..77a6f5f 100644
--- a/src/modules_eq.cpp
+++ b/src/modules_eq.cpp
@@ -251,7 +251,7 @@ uint32_t equalizerNband_audio_module<BaseClass, has_lphp>::process(uint32_t offs
 }
 
 template<class BaseClass, bool has_lphp>
-bool equalizerNband_audio_module<BaseClass, has_lphp>::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool equalizerNband_audio_module<BaseClass, has_lphp>::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active)
         return false;
diff --git a/src/modules_limit.cpp b/src/modules_limit.cpp
index e8a4666..a24df95 100644
--- a/src/modules_limit.cpp
+++ b/src/modules_limit.cpp
@@ -636,7 +636,7 @@ uint32_t multibandlimiter_audio_module::process(uint32_t offset, uint32_t numsam
     return outputs_mask;
 }
 
-bool multibandlimiter_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool multibandlimiter_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active or subindex > 3)
         return false;
@@ -647,7 +647,7 @@ bool multibandlimiter_audio_module::get_graph(int index, int subindex, float *da
     {
         ret = 1.f;
         freq = 20.0 * pow (20000.0 / 20.0, i * 1.0 / points);
-        switch(mode) {
+        switch(*mode) {
             case 0:
             default:
                 j1 = 0;
diff --git a/src/modules_mod.cpp b/src/modules_mod.cpp
index b51a49e..e6a5047 100644
--- a/src/modules_mod.cpp
+++ b/src/modules_mod.cpp
@@ -49,7 +49,7 @@ void flanger_audio_module::deactivate() {
     is_active = false;
 }
 
-bool flanger_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool flanger_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active)
         return false;
@@ -134,7 +134,7 @@ void phaser_audio_module::deactivate()
     is_active = false;
 }
 
-bool phaser_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool phaser_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active)
         return false;
@@ -426,7 +426,7 @@ void multichorus_audio_module::set_sample_rate(uint32_t sr) {
     right.setup(sr);
 }
 
-bool multichorus_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool multichorus_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active)
         return false;
@@ -707,18 +707,18 @@ uint32_t pulsator_audio_module::process(uint32_t offset, uint32_t numsamples, ui
     return outputs_mask;
 }
 
-bool pulsator_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool pulsator_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (!is_active) {
         return false;
     } else if(index == param_freq) {
         if(subindex == 0) {
             context->set_source_rgba(0.35, 0.4, 0.2, 1);
-            return lfoL.get_graph(data, points, context);
+            return lfoL.get_graph(data, points, context, mode);
         }
         if(subindex == 1) {
             context->set_source_rgba(0.35, 0.4, 0.2, 0.5);
-            return lfoR.get_graph(data, points, context);
+            return lfoR.get_graph(data, points, context, mode);
         }
     }
     return false;
diff --git a/src/monosynth.cpp b/src/monosynth.cpp
index 1eea9dc..ae2213b 100644
--- a/src/monosynth.cpp
+++ b/src/monosynth.cpp
@@ -182,7 +182,7 @@ void monosynth_audio_module::precalculate_waves(progress_report_iface *reporter)
     
 }
 
-bool monosynth_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool monosynth_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     monosynth_audio_module::precalculate_waves(NULL);
     // printf("get_graph %d %p %d wave1=%d wave2=%d\n", index, data, points, wave1, wave2);
diff --git a/src/organ.cpp b/src/organ.cpp
index fad15ed..25d434f 100644
--- a/src/organ.cpp
+++ b/src/organ.cpp
@@ -73,7 +73,7 @@ void organ_audio_module::params_changed() {
     update_params();
 }
 
-bool organ_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context) const
+bool organ_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context, int *mode) const
 {
     if (index == par_master) {
         organ_voice_base::precalculate_waves(progress_report);

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list