[SCM] calf/master: + Framework: placeholder for waveshaper class (need it to merge further changes from Markus)

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d48420ce85389af6d20623af83ca20082f1cdcaa
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Mon Nov 9 21:47:03 2009 +0000

    + Framework: placeholder for waveshaper class (need it to merge further changes from Markus)

diff --git a/src/calf/Makefile.am b/src/calf/Makefile.am
index 5688ccd..56963f6 100644
--- a/src/calf/Makefile.am
+++ b/src/calf/Makefile.am
@@ -5,4 +5,4 @@ noinst_HEADERS = audio_fx.h benchmark.h biquad.h buffer.h custom_ctl.h \
     lv2_uri_map.h lv2-midiport.h lv2helpers.h lv2wrap.h \
     main_win.h metadata.h modmatrix.h modules.h modules_dev.h modules_small.h modules_synths.h modulelist.h \
     multichorus.h onepole.h organ.h osc.h osctl.h osctlnet.h osctlserv.h plugininfo.h preset.h \
-    preset_gui.h primitives.h synth.h utils.h wave.h
+    preset_gui.h primitives.h synth.h utils.h wave.h waveshaping.h
diff --git a/src/calf/osctlserv.h b/src/calf/waveshaping.h
similarity index 53%
copy from src/calf/osctlserv.h
copy to src/calf/waveshaping.h
index 5b44c47..914637c 100644
--- a/src/calf/osctlserv.h
+++ b/src/calf/waveshaping.h
@@ -1,7 +1,7 @@
 /* Calf DSP Library
- * Open Sound Control UDP server support
+ * Placeholder for waveshaping classes
  *
- * Copyright (C) 2007-2009 Krzysztof Foltman
+ * Copyright (C) 2001-2009 Krzysztof Foltman
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,33 +16,22 @@
  * You should have received a copy of the GNU Lesser General
  * Public License along with this program; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
- * Boston, MA  02110-1301  USA
+ * Boston, MA 02111-1307, USA.
  */
+#ifndef __CALF_WAVESHAPING_H
+#define __CALF_WAVESHAPING_H
 
-#ifndef __CALF_OSCTLSERV_H
-#define __CALF_OSCTLSERV_H
-
-#include <glib.h>
-#include "osctlnet.h"
-
-namespace osctl
-{
-    
-struct osc_server: public osc_socket
-{
-    GIOChannel *ioch;
-    osc_message_dump<osc_strstream, std::ostream> dump;
-    osc_message_sink<osc_strstream> *sink;
-    
-    osc_server() : ioch(NULL), dump(std::cout), sink(&dump) {}
-    
-    virtual void on_bind();
-    
-    static gboolean on_data(GIOChannel *channel, GIOCondition cond, void *obj);
-    void parse_message(const char *buffer, int len);    
-    ~osc_server();
-};
-
+/// This will be a waveshaper... when I'll code it (-:
+/// (or get Tom Szlagyi's permission to use his own)
+class waveshaper {
+public:
+    waveshaper();
+    void activate() {}
+    void deactivate() {}
+    void set_params(float blend, float drive) {}
+    void set_sample_rate(uint32_t sr) {}
+    float process(float in) { return in; }
+    float get_distortion_level() { return 1; }
 };
 
 #endif

-- 
calf audio plugins packaging