Add modulus operator to MIDI transformer.

Useful for doing things like making alternating bowing patterns.

diff --git a/gtk2_ardour/transform_dialog.cc b/gtk2_ardour/transform_dialog.cc
index 35df027187968669429d827bda423b2e7b444893..762f504aa2d2df00e7b86b48ff928e327e94cf7c 100644 (file)
--- a/gtk2_ardour/transform_dialog.cc
+++ b/gtk2_ardour/transform_dialog.cc
@@ -69,7 +69,7 @@ TransformDialog::Model::Model()
        }
 
        static const char* operator_labels[] = {
-               /* no PUSH */ "+", "-", "*", "/", NULL
+               /* no PUSH */ "+", "-", "*", "/", "mod", NULL
        };
        for (int o = 0; operator_labels[o]; ++o) {
                Gtk::TreeModel::Row row = *(operator_list->append());

diff --git a/libs/ardour/ardour/transform.h b/libs/ardour/ardour/transform.h
index 2b63bb6af035978cff3b7f7de8d4154453f17922..08e4a435215f0320b923b90bb93735631bf2d40f 100644 (file)
--- a/libs/ardour/ardour/transform.h
+++ b/libs/ardour/ardour/transform.h
@@ -106,7 +106,8 @@ public:
                        ADD,   ///< Add top two values
                        SUB,   ///< Subtract top from second-top
                        MULT,  ///< Multiply top two values
-                       DIV    ///< Divide second-top by top
+                       DIV,   ///< Divide second-top by top
+                       MOD    ///< Modulus (division remainder)
                };
 
                Operation(Operator o, const Value& a=Value()) : op(o), arg(a) {}

diff --git a/libs/ardour/transform.cc b/libs/ardour/transform.cc
index 9a91a657317170e96065189ac98cf6878e66d5cb..3b4f53c8605b5aa0b9f0d82a810a20e5c12f5e0d 100644 (file)
--- a/libs/ardour/transform.cc
+++ b/libs/ardour/transform.cc
@@ -106,6 +106,12 @@ Transform::Operation::eval(Context& ctx) const
                }
                value /= rhs.to_double();
                break;
+       case MOD:
+               if (rhs.to_double() == 0.0) {
+                       return;  // Program will fail safely
+               }
+               value = fmod(value, rhs.to_double());
+               break;
        default: break;
        }