From ac159d899bf57e2022872c06d28c0e33b11fc7ce Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 26 Jun 2024 17:19:45 -0600 Subject: [PATCH 1/4] new MIDNAM for the Kurzweil K2700, from Nikolaos Strikos --- share/patchfiles/Kurzweil_K2700.midnam | 1690 ++++++++++++++++++++++++ 1 file changed, 1690 insertions(+) create mode 100644 share/patchfiles/Kurzweil_K2700.midnam diff --git a/share/patchfiles/Kurzweil_K2700.midnam b/share/patchfiles/Kurzweil_K2700.midnam new file mode 100644 index 0000000000..e10787e033 --- /dev/null +++ b/share/patchfiles/Kurzweil_K2700.midnam @@ -0,0 +1,1690 @@ + + + + + Kurzweil + K2700 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From da520cecf3e55a373b7918376214ca50117be2d9 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 26 Jun 2024 15:34:43 +0200 Subject: [PATCH 2/4] Yet another attempt at gcc-14 lstat/realpath (#9703 PR #893) See also 4b8b5acfc4 and realpath(3) ``` realpath(): _XOPEN_SOURCE >= 500 || /* Glibc since 2.19: */ _DEFAULT_SOURCE || /* Glibc versions <= 2.19: */ _BSD_SOURCE ``` --- libs/aaf/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/aaf/wscript b/libs/aaf/wscript index fc24d15bea..e6a1337b5a 100644 --- a/libs/aaf/wscript +++ b/libs/aaf/wscript @@ -60,7 +60,7 @@ def build(bld): #obj.uselib = 'GLIB' obj.vnum = LIBAAF_LIB_VERSION obj.install_path = bld.env['LIBDIR'] - obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"', '_POSIX_C_SOURCE=200809L' ] + obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"', '_POSIX_C_SOURCE=200809L', '_XOPEN_SOURCE=500' ] def shutdown(): autowaf.shutdown() From 8efab1c79641e597a5f9d9c7e898ab96a58ab026 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 27 Jun 2024 16:41:53 -0600 Subject: [PATCH 3/4] fix handling of MIDI controller MSB & LSB values The MIDI specification makes it quite clear that when a receiver receives the MSB of a 14 bit controller value, it should consider the LSB reset to zero. This has been an error in Ardour for many, many years, though likely of little consequence --- libs/midi++2/channel.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/midi++2/channel.cc b/libs/midi++2/channel.cc index d64cd3642e..5f4bf9d19d 100644 --- a/libs/midi++2/channel.cc +++ b/libs/midi++2/channel.cc @@ -272,8 +272,8 @@ Channel::process_controller (Parser & parser, EventTwoBytes *tb) if (tb->controller_number < 32) { /* unsigned: no test for >= 0 */ /* if this controller is already known to use 14 bits, - then treat this value as the MSB, and combine it - with the existing LSB. + then treat this value as the MSB, and as per MIDI spec, set + LSB to zero. otherwise, just treat it as a 7 bit value, and set it directly. @@ -282,7 +282,7 @@ Channel::process_controller (Parser & parser, EventTwoBytes *tb) cv = (unsigned short) _controller_val[tb->controller_number]; if (_controller_14bit[tb->controller_number]) { - cv = ((tb->value & 0x7f) << 7) | (cv & 0x7f); + cv = (tb->value & 0x7f) << 7); } else { cv = tb->value; } From 41b6c8a5bfbdbfd302225f47ea68369231221fda Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 27 Jun 2024 16:51:16 -0600 Subject: [PATCH 4/4] fix previous commit (typo) --- libs/midi++2/channel.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/midi++2/channel.cc b/libs/midi++2/channel.cc index 5f4bf9d19d..b5cabd9f8d 100644 --- a/libs/midi++2/channel.cc +++ b/libs/midi++2/channel.cc @@ -282,7 +282,7 @@ Channel::process_controller (Parser & parser, EventTwoBytes *tb) cv = (unsigned short) _controller_val[tb->controller_number]; if (_controller_14bit[tb->controller_number]) { - cv = (tb->value & 0x7f) << 7); + cv = (tb->value & 0x7f) << 7; } else { cv = tb->value; }