ardour/livetrax
13
0
Fork 0
Code

Merge branch 'ardour'

Browse Source
This commit is contained in:
Robin Gareus 2024-06-29 01:59:56 +02:00
commit 80d4950536
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 1694 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/aaf/wscript
View File

@ -60,7 +60,7 @@ def build(bld):
#obj.uselib = 'GLIB' #obj.uselib = 'GLIB'
obj.vnum = LIBAAF_LIB_VERSION obj.vnum = LIBAAF_LIB_VERSION
obj.install_path = bld.env['LIBDIR'] 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(): def shutdown():
autowaf.shutdown() autowaf.shutdown()

6
libs/midi++2/channel.cc
View File

@ -272,8 +272,8 @@ Channel::process_controller (Parser & parser, EventTwoBytes *tb)
if (tb->controller_number < 32) { /* unsigned: no test for >= 0 */ if (tb->controller_number < 32) { /* unsigned: no test for >= 0 */
/* if this controller is already known to use 14 bits, /* if this controller is already known to use 14 bits,
then treat this value as the MSB, and combine it then treat this value as the MSB, and as per MIDI spec, set
with the existing LSB. LSB to zero.
otherwise, just treat it as a 7 bit value, and set otherwise, just treat it as a 7 bit value, and set
it directly. it directly.
@ -282,7 +282,7 @@ Channel::process_controller (Parser & parser, EventTwoBytes *tb)
cv = (unsigned short) _controller_val[tb->controller_number]; cv = (unsigned short) _controller_val[tb->controller_number];
if (_controller_14bit[tb->controller_number]) { if (_controller_14bit[tb->controller_number]) {
cv = ((tb->value & 0x7f) << 7) | (cv & 0x7f); cv = (tb->value & 0x7f) << 7;
} else { } else {
cv = tb->value; cv = tb->value;
} }

1690
share/patchfiles/Kurzweil_K2700.midnam Normal file
View File

File diff suppressed because it is too large Load Diff