From 772072ec8d13ad31eba456a01873b84577f3f2da Mon Sep 17 00:00:00 2001
From: Albert Graef <aggraef@gmail.com>
Date: Sun, 16 Aug 2020 21:06:49 +0200
Subject: [PATCH] Improve bendin compatibility with vanilla.
This adds an option to make bendin use the vanilla range of 0..16383 for
compatibility. As was observed a long time ago, this is at odds with the
bendout range of -8192..8191, and was thus fixed in pd-l2ork at some
point. But Miller Puckette has decided that this bug won't *ever* be fixed in
vanilla, and this is even documented in vanilla's midi-help.pd patch.
This discrepancy breaks a lot of patches involving MIDI, so a compatibility
option is needed. It's been possible to use -legacy to get vanilla's bendin,
but it's better not to conflate legacy iemgui positioning issues with the
bendin implementation. The former won't usually break interoperability, but
the latter does.
So, as suggested by Ico Bukvic, we add a flag as an optional second argument
to bendin instead. If present, this option explicitly denotes the target
range: zero means the default (pd-l2ork, signed) output range, nonzero the
vanilla-compatible unsigned range. In addition, there's a new -legacy-bendin
command line option which makes unsigned output the default for bendin objects
which don't specify the range explicitly. You'll want to put this into your
startup flags in the preferences if you need out-of-the-box vanilla
compatibility.
---
pd/src/s_main.c | 9 +++++++++
pd/src/x_midi.c | 21 ++++++++++++---------
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/pd/src/s_main.c b/pd/src/s_main.c
index 62ad4dc69..f3c3d14ac 100644
--- a/pd/src/s_main.c
+++ b/pd/src/s_main.c
@@ -57,6 +57,8 @@ int sys_unique = 0; /* by default off, prevents multiple instances
of pd-l2ork */
int sys_legacy = 0; /* by default off, used to enable legacy features,
such as offsets in iemgui object positioning */
+int sys_legacy_bendin = 0; /* by default off, used to enable vanilla-
+ compatible (unsigned) pitch bend input */
char *sys_guicmd;
t_symbol *sys_gui_preset; /* name of gui theme to be used */
t_symbol *sys_libdir;
@@ -531,6 +533,7 @@ static char *(usagemessage[]) = {
"-k12 -- enable K-12 education mode (requires L2Ork K12 lib)\n",
"-unique -- enable multiple instances (disabled by default)\n",
"-legacy -- enable legacy features (disabled by default)\n",
+"-legacy-bendin -- enable legacy (unsigned) bendin (disabled by default)\n",
"\n",
};
@@ -938,6 +941,12 @@ int sys_argparse(int argc, char **argv)
argc -= 1;
argv += 1;
}
+ else if (!strcmp(*argv, "-legacy-bendin"))
+ {
+ sys_legacy_bendin = 1;
+ argc -= 1;
+ argv += 1;
+ }
else if (!strcmp(*argv, "-guiport") && argc > 1 &&
sscanf(argv[1], "%d", &sys_guisetportnumber) >= 1)
{
diff --git a/pd/src/x_midi.c b/pd/src/x_midi.c
index c827ea737..2f75442d7 100644
--- a/pd/src/x_midi.c
+++ b/pd/src/x_midi.c
@@ -307,14 +307,21 @@ typedef struct _bendin
{
t_object x_obj;
t_float x_channel;
+ t_float x_offs;
t_outlet *x_outlet1;
t_outlet *x_outlet2;
} t_bendin;
-static void *bendin_new(t_floatarg f)
+static void *bendin_new(t_symbol *s, int argc, t_atom *argv)
{
t_bendin *x = (t_bendin *)pd_new(bendin_class);
+ extern int sys_legacy_bendin;
+ t_float f = 0.0, g = sys_legacy_bendin;
+ f = atom_getfloatarg(0, argc, argv);
+ if (argc > 1)
+ g = atom_getfloatarg(1, argc, argv);
x->x_channel = f;
+ x->x_offs = g==0.0?-8192.0:0.0;
x->x_outlet1 = outlet_new(&x->x_obj, &s_float);
if (f == 0) x->x_outlet2 = outlet_new(&x->x_obj, &s_float);
pd_bind(&x->x_obj.ob_pd, pd_this->pd_bendin_sym);
@@ -328,12 +335,12 @@ static void bendin_list(t_bendin *x, t_symbol *s, int argc, t_atom *argv)
if (x->x_channel != 0)
{
if (channel != x->x_channel) return;
- outlet_float(x->x_outlet1, value);
+ outlet_float(x->x_outlet1, value + x->x_offs);
}
else
{
outlet_float(x->x_outlet2, channel);
- outlet_float(x->x_outlet1, value);
+ outlet_float(x->x_outlet1, value + x->x_offs);
}
}
@@ -345,7 +352,7 @@ static void bendin_free(t_bendin *x)
static void bendin_setup(void)
{
bendin_class = class_new(gensym("bendin"), (t_newmethod)bendin_new,
- (t_method)bendin_free, sizeof(t_bendin), CLASS_NOINLET, A_DEFFLOAT, 0);
+ (t_method)bendin_free, sizeof(t_bendin), CLASS_NOINLET, A_GIMME, 0);
class_addlist(bendin_class, bendin_list);
class_sethelpsymbol(bendin_class, gensym("midi"));
}
@@ -355,11 +362,7 @@ void inmidi_pitchbend(int portno, int channel, int value)
if (pd_this->pd_bendin_sym->s_thing)
{
t_atom at[2];
- // AG: -legacy behavior was changed so that it is consistent with
- // vanilla bendin.
- extern int sys_legacy;
- int shift = sys_legacy ? 0 : 8192;
- SETFLOAT(at, value-shift); // Ico fix the offset of the incoming pitchbend
+ SETFLOAT(at, value);
SETFLOAT(at+1, (channel + (portno << 4) + 1));
pd_list(pd_this->pd_bendin_sym->s_thing, &s_list, 2, at);
}
--
GitLab