[SCM] calf/master: Merge commit 'remotes/origin/master'

[js at users.alioth.debian.org]

+ Framework: factor gridline drawing out of Filter, Filterclavier, Phaser and Flanger, implement a basic version of get_changed_offsets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d6a3c1a63a147948535a50da009275278ad5e6a3
X-Git-Newrev: 34569260c452f0fa4c543155ebba174a42a343dc

The following commit has been merged in the master branch:
commit fa48468923771a4a83cdaa37f5fdc272df58eaf7
Merge: 10756f1729a0b3fcfa460985f6991fcc87ef7b49 868b87b781f3b470b4012a19debc8cb969767ecf
Author: Torben Hohn <torbenh at gmx.de>
Date:   Sat Jan 24 22:01:23 2009 +0100

    Merge commit 'remotes/origin/master'

diff --combined src/calf/modules.h
index e1a0fbc,8bbcd20..79e9c0f
--- a/src/calf/modules.h
+++ b/src/calf/modules.h
@@@ -61,7 -61,13 +61,13 @@@ public
  };
  #endif
  
- class flanger_audio_module: public audio_module<flanger_metadata>, public line_graph_iface
+ class frequency_response_line_graph: public line_graph_iface 
+ {
+     bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context);
+     virtual int get_changed_offsets(int generation, int &subindex_graph, int &subindex_dot, int &subindex_gridline);
+ };
+ 
+ class flanger_audio_module: public audio_module<flanger_metadata>, public frequency_response_line_graph
  {
  public:
      dsp::simple_flanger<float, 2048> left, right;
@@@ -119,11 -125,11 +125,11 @@@ public
          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);
-     bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context);
      float freq_gain(int subindex, float freq, float srate);
+     virtual int get_changed_offsets(int generation, int &subindex_graph, int &subindex_dot, int &subindex_gridline) { subindex_graph = subindex_dot = subindex_gridline = 0; return 0; }
  };
  
- class phaser_audio_module: public audio_module<phaser_metadata>, public line_graph_iface
+ class phaser_audio_module: public audio_module<phaser_metadata>, public frequency_response_line_graph
  {
  public:
      float *ins[in_count]; 
@@@ -212,7 -218,7 +218,7 @@@ public
          left_hi.set_hp(dsp::clip(*params[par_basscut], 20.f, (float)(srate * 0.49f)), srate);
          right_lo.copy_coeffs(left_lo);
          right_hi.copy_coeffs(left_hi);
 -        predelay_amt = srate * (*params[par_predelay]) * (1.0f / 1000.0f) + 1;
 +        predelay_amt = (int) (srate * (*params[par_predelay]) * (1.0f / 1000.0f) + 1);
      }
      uint32_t process(uint32_t offset, uint32_t numsamples, uint32_t inputs_mask, uint32_t outputs_mask) {
          numsamples += offset;
@@@ -432,7 -438,7 +438,7 @@@ public
      {
          // premature optimization is a root of all evil; it can be done with integers only - but later :)
          double v = counter * (1.0 / (65536.0 * 32768.0));
 -        return 32768 + 32768 * (v - v*v*v) * (1.0 / 0.3849);
 +        return (int) (32768 + 32768 * (v - v*v*v) * (1.0 / 0.3849));
      }
      /// Increase or decrease aspeed towards raspeed, with required negative and positive rate
      inline bool incr_towards(float &aspeed, float raspeed, float delta_decc, float delta_acc)
@@@ -680,7 -686,7 +686,7 @@@ public
  class filter_audio_module: 
      public audio_module<filter_metadata>, 
      public filter_module_with_inertia<biquad_filter_module, filter_metadata>, 
-     public line_graph_iface
+     public frequency_response_line_graph
  {
  public:    
      void params_changed()
@@@ -707,7 -713,6 +713,6 @@@
      }
      
      bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context);
-     bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context);
  };
  
  /// A multitap stereo chorus thing - processing
@@@ -827,7 -832,7 +832,7 @@@ public
  class filterclavier_audio_module: 
          public audio_module<filterclavier_metadata>, 
          public filter_module_with_inertia<biquad_filter_module, filterclavier_metadata>, 
-         public line_graph_iface
+         public frequency_response_line_graph
  {        
      const float min_gain;
      const float max_gain;
@@@ -909,7 -914,6 +914,6 @@@ public
      }
  
      bool get_graph(int index, int subindex, float *data, int points, cairo_iface *context);
-     bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context);
      
  private:
      void adjust_gain_according_to_filter_mode(int velocity) {

-- 
calf audio plugins packaging