[SCM] calf/master: + Small modules: added control version of Minimum and Maximum, renamed audio Min and Max to Minimum and Maximum

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 15b6cd280d30c62c7a9b5cddd04587ff22334243
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Mon Oct 6 20:53:23 2008 +0000

    + Small modules: added control version of Minimum and Maximum, renamed audio Min and Max to Minimum and Maximum
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@318 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/src/calf/modulelist.h b/src/calf/modulelist.h
index 186644b..c4a5e55 100644
--- a/src/calf/modulelist.h
+++ b/src/calf/modulelist.h
@@ -19,6 +19,8 @@
     PER_SMALL_MODULE_ITEM(minus, "minus")
     PER_SMALL_MODULE_ITEM(mul, "mul")
     PER_SMALL_MODULE_ITEM(neg, "neg")
+    PER_SMALL_MODULE_ITEM(min_c, "min_c")
+    PER_SMALL_MODULE_ITEM(max_c, "max_c")
     PER_SMALL_MODULE_ITEM(minus_c, "minus_c")
     PER_SMALL_MODULE_ITEM(mul_c, "mul_c")
     PER_SMALL_MODULE_ITEM(neg_c, "neg_c")
diff --git a/src/modules_small.cpp b/src/modules_small.cpp
index 6e7f561..c110cc2 100644
--- a/src/modules_small.cpp
+++ b/src/modules_small.cpp
@@ -231,7 +231,7 @@ public:
     }
     static void plugin_info(plugin_info_iface *pii)
     {
-        pii->names("min", "Min (A)", "kf:MathOperatorPlugin", "min");
+        pii->names("min", "Minimum (A)", "kf:MathOperatorPlugin", "min");
         port_info(pii);
     }
 };
@@ -245,7 +245,7 @@ public:
     }
     static void plugin_info(plugin_info_iface *pii)
     {
-        pii->names("max", "Max (A)", "kf:MathOperatorPlugin", "max");
+        pii->names("max", "Maximum (A)", "kf:MathOperatorPlugin", "max");
         port_info(pii);
     }
 };
@@ -353,6 +353,34 @@ public:
     }
 };
 
+class min_c_audio_module: public control_operator_audio_module<2>
+{
+public:
+    void process(uint32_t count) {
+        *outs[0] = std::min(*ins[0], *ins[1]);
+    }
+    static void plugin_info(plugin_info_iface *pii)
+    {
+        pii->names("min_c", "Minimum (C)", "kf:MathOperatorPlugin", "min");
+        control_port_info_iface *cports[3];
+        port_info(pii, cports);
+    }
+};
+
+class max_c_audio_module: public control_operator_audio_module<2>
+{
+public:
+    void process(uint32_t count) {
+        *outs[0] = std::max(*ins[0], *ins[1]);
+    }
+    static void plugin_info(plugin_info_iface *pii)
+    {
+        pii->names("max_c", "Maximum (C)", "kf:MathOperatorPlugin", "max");
+        control_port_info_iface *cports[3];
+        port_info(pii, cports);
+    }
+};
+
 class less_c_audio_module: public control_operator_audio_module<2>
 {
 public:
@@ -973,7 +1001,7 @@ public:
     static bool message_run(LV2_Handle instance, uint32_t *outputs_written)
     {
         print_em_audio_module *self =  (print_em_audio_module *)instance;
-        printf("message_run (events = %p)\n", self->events);
+        printf("message_run (events = %p, count = %d)\n", self->events, self->events->event_count);
         self->dump(self->events);
         *outputs_written = 0;
         return false;

-- 
calf audio plugins packaging