diff --git a/externals/Makefile b/externals/Makefile index 3ed6d201d23583c5b6f9f2ebf4da55a4a06f5009..9f55395a6671438e34894d3cde921d908c494202 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -139,7 +139,7 @@ ifeq ($(LIGHT),yes) lib_targets = loaders-libdir pddp INCREMENTAL = yes else -lib_targets = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease flatgui fluid freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdlua pdogg plugin pmpd rjlib sigpack smlib tof unauthorized vbap windowing zexy +lib_targets = adaptive arraysize autotune bassemu bendinfix boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease flatgui fluid freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdlua pdogg plugin pmpd rjlib sigpack smlib tof unauthorized vbap windowing zexy endif # NEW (IN-PROGRESS): flext @@ -358,6 +358,21 @@ bassemu_clean: make -C $(externals_src)/bassemu~ clean +#------------------------------------------------------------------------------# +# BENDINFIX + +bendinfix: + make -C $(externals_src)/bendinfix PD_PATH=$(pd_src) \ + pdbinpath=$(pd_src)/src CFLAGS="$(CFLAGS_ADD)" + +bendinfix_install: + make -C $(externals_src)/bendinfix DESTDIR="$(DESTDIR)" \ + objectsdir="$(objectsdir)" install + +bendinfix_clean: + make -C $(externals_src)/bendinfix clean + + #------------------------------------------------------------------------------# # BOIDS boids: diff --git a/externals/bendinfix/LICENSE b/externals/bendinfix/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..da48c4f142060537638223b6d3afedc2a629e1ce --- /dev/null +++ b/externals/bendinfix/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 Albert Gräf + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/externals/bendinfix/Makefile b/externals/bendinfix/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..7e0519376ef5ce444708fa39f73279c61a5a5ece --- /dev/null +++ b/externals/bendinfix/Makefile @@ -0,0 +1,8 @@ + +lib.name = bendinfix + +class.sources = bendinfix.c + +datafiles = bendinfix-help.pd LICENSE README.md + +include Makefile.pdlibbuilder.revised diff --git a/externals/bendinfix/Makefile.pdlibbuilder.revised b/externals/bendinfix/Makefile.pdlibbuilder.revised new file mode 100644 index 0000000000000000000000000000000000000000..c2da4e48d8390f5eb0324f874d76e95f33d4949a --- /dev/null +++ b/externals/bendinfix/Makefile.pdlibbuilder.revised @@ -0,0 +1,1210 @@ +# Makefile.pdlibbuilder dated 2016-06-26 + +version = 0.2.5 + +# Helper makefile for Pure Data external libraries. +# Written by Katja Vetter March-June 2015 for the public domain. No warranties. +# Inspired by Hans Christoph Steiner's Makefile Template and Stephan Beal's +# ShakeNMake. +# +# GNU make version >= 3.81 required. +# +# +#=== characteristics =========================================================== +# +# +# - defines build settings based on autodetected OS and architecture +# - defines rules to build Pd class- or lib executables from C or C++ sources +# - defines rules for libdir installation +# - defines convenience targets for developer and user +# - evaluates implicit dependencies for non-clean builds +# +# +#=== basic usage =============================================================== +# +# +# In your Makefile, define your Pd lib name and class files, and include +# Makefile.pdlibbuilder at the end of the Makefile. Like so: +# +# ________________________________________________________________________ +# +# # Makefile for mylib +# +# lib.name = mylib +# +# class.sources = myclass1.c myclass2.c +# +# datafiles = myclass1-help.pd myclass2-help.pd README.txt LICENSE.txt +# +# include Makefile.pdlibbuilder +# ________________________________________________________________________ +# +# +# For files in class.sources it is assumed that class basename == source file +# basename. The default target builds all classes as individual executables +# with Pd's default extension for the platform. For anything more than the +# most basic usage, continue reading. +# +# +#=== list of Makefile.pdlibbuilder API variables =============================== +# +# +# Variables available for definition in your library Makefile: +# +# - lib.name +# - lib.setup.sources +# - class.sources +# - common.sources +# - shared.sources +# - <classname>.class.sources +# - <classname>.class.ldflags +# - <classname>.class.ldlibs +# - cflags +# - ldflags +# - ldlibs +# - datafiles +# - datadirs +# - makefiles +# - makefiledirs +# - externalsdir +# +# Optional multiline defines evaluated per operating system: +# +# - forLinux +# - forDarwin +# - forWindows +# +# +# Variables avaialable for (re)definition via command arguments: +# +# - pdbinpath (Windows only) +# - pdincludepath +# - DESTDIR +# - prefix +# - libdir +# - pkglibdir +# - CPPFLAGS +# - CFLAGS +# - LDFLAGS +# - CC +# - CXX +# - INSTALL +# - INSTALL_PROGRAM +# - INSTALL_DATA +# - INSTALL_DIR +# +# Variables available for your makefile or as command argument: +# +# - objectsdir +# - make-lib-executable +# - suppress-wunused +# +# +#=== descriptions of Makefile.pdlibbuilder API variables ======================= +# +# +# lib.name: +# Name of the library directory as it will be installed / distributed. Also the +# name of the lib executable in the case where all classes are linked into +# a single binary. +# +# lib.setup.sources: +# Source file(s) (C or C++) which must be compiled only when linking all classes +# into a single lib binary. +# +# class.sources: +# All sources files (C or C++) for which the condition holds that +# class name == source file basename. +# +# <classname>.class.sources: +# Source file(s) (C or C++) specific to class <classname>. Use this for +# multiple-source classes or when class name != source file basename. +# +# common.sources: +# Source file(s) which must be statically linked to each class in the library. +# +# shared.sources: +# Source file(s) (C or C++) to build a shared dynamic link lib, to be linked +# with all class executables. +# +# cflags, ldflags, ldlibs: +# Define cflags (preprocessor&compiler), ldflags (linker) and ldlibs (dynamic +# link libs) for the whole library. These flags are added to platform-specific +# flags defined by Makefile.pdlibbuilder. +# +# <classname>.class.ldflags and <classname>.class.ldlibs: +# Define ldflags resp. ldlibs specific to class <classname>. These flags are +# added to platform-specific flags defined by Makefile.pdlibbuilder, and flags +# defined in your Makefile for the whole library. Note: cflags can not be +# defined per class in the current implementation. +# +# datafiles and datadirs: +# All extra files you want to include in binary distributions of the +# library: abstractions and help patches, example patches, meta patch, readme +# and license texts, manuals, sound files, etcetera. Use 'datafiles' for all +# files that should go into your lib rootdir and 'datadirs' for complete +# directories you want to copy from source to distribution. +# +# externalsdir: +# Relative path to directory 'externals' in the context of pd-extended SVN, or +# any other centralized build layout for multiple libraries. Default value +# is '..', meaning the direct parent. The value is used in search paths for +# pd core components (header files, and executable in the case of Windows). +# +# forLinux, forDarwin, forWindows: +# Shorthand for 'variable definitions for Linux only' etc. Use like: +# define forLinux +# cflags += -DLINUX +# class.sources += linuxthing.c +# endef +# +# makefiles and makefiledirs: +# Extra makefiles or directories with makefiles that should be made in sub-make +# processes. +# +# pdbinpath: +# For Windows only. Directory where pd.dll can be found for linking. +# +# pdincludepath: +# Directory where Pd API m_pd.h can be found, and other Pd header files. +# +# DESTDIR, prefix, libdir: +# Components of the path for installation as conventionally used on Linux. +# +# pkglibdir: +# Base path for installation of Pd library directories. Default is specified +# per OS, see section about paths below. +# +# objectsdir: +# Alias of pkglibdir. Can be defined in your makefile to enable project- +# dependent relative install locations. +# +# CPPFLAGS: +# Preprocessor flags which are not strictly required for building. +# +# CFLAGS: +# Compiler flags which are not strictly required for building. Compiler flags +# defined by Makefile.pdlibbuilder for warning, optimization and architecture +# specification are overriden by CFLAGS. +# +# LDFLAGS: +# Linker flags which are not strictly required for building. Linker flags +# defined by Makefile.pdlibbuilder for architecture specification are overriden +# by LDFLAGS. +# +# CC and CXX: +# C and C++ compiler programs as defined in your build environment. +# +# INSTALL, INSTALL_PROGRAM, INSTALL_DATA, INSTALL_DIR: +# Definitions of install program, may be overriden via command argument. +# +# make-lib-executable: +# When this variable is defined 'yes' in your makefile or as command argument, +# Makefile.pdlibbuilder will try to build all classes into a single library +# executable (but it will force exit if lib.setup.sources is undefined). +# If your makefile defines 'make-lib-executable=yes' as the library default, +# this can still be overriden with 'make-lib-executable=no' as command argument +# to build individual class executables (the Makefile.pdlibbuilder default.) +# +# suppress-wunused: +# When this variable is defined ('yes' or any other value), -Wunused-variable, +# -Wunused-parameter, -Wunused-value and -Wunused-function are suppressed, +# but the other warnings from -Wall are retained. +# +# +#=== paths ===================================================================== +# +# +# Source files in directories other than current working directory must be +# prefixed with their relative path. Do not rely on VPATH or vpath. +# Object (.o) files are built in the directory of their source files. +# Executables are built in current working directory. +# +# Variable 'pdincludepath' stores a location where m_pd.h is expected to reside. +# Locations where Makefile.pdlibbuilder tries to find it, in order of priority: +# +# any OS: $(externalsdir)../pd/src +# +# Linux: /usr/include/pdextended +# /usr/include/pd +# +# OSX: /Applications/Pd-extended.app/Contents/Resources/include/pdextended +# /Applications/Pd.app/Contents/Resources/src +# +# Windows: %PROGRAMFILES%/pd/include/pdextended +# %PROGRAMFILES%/pd/src +# +# The path for installation of all library components is constructed as: +# +# installpath := $(DESTDIR)$(objectsdir)/$(lib.name) +# +# Default for 'objectsdir' is defined per platform and follows this convention: +# https://puredata.info/docs/faq/how-do-i-install-externals-and-help-files +# +# Linux: /usr/local/lib/pd-externals +# OSX: ~/Library/Pd +# Windows: %APPDATA%/Pd +# +# The rationale for not installing to ~/pd-externals by default on Linux +# is that some people share the home dir between 32 and 64 bit installations. +# +# +#=== targets =================================================================== +# +# +# all: build $(executables) plus optional post target +# post: target to build after $(executables) +# alldebug: build all with -g option turned on for debug symbols +# <classname>: force clean build of an individual class +# <sourcefile>.pre: make preprocessor output file in current working directory +# <sourcefile>.lst: make asm/source output file in current working directory +# +# install: install executables and data files +# clean: remove build products from source tree +# +# help: print help text +# vars: print makefile variables +# allvars: print all variables +# depend: print generated prerequisites +# coffee: dummy target +# +# Variable $(executables) expands to class executables plus optional shared lib, +# or alternatively to single lib executable when make-lib-executable=true. +# Targets pre and post can be defined by library makefile. Make sure to include +# Makefile.pdlibbuilder first so default target all will not be redefined. +# +# +#=== Pd-extended libdir concept ================================================ +# +# +# For libdir layout as conceived by Hans-Christoph Steiner, see: +# +# https://puredata.info/docs/developer/Libdir +# +# Files README.txt, LICENSE.txt and <lib.name>-meta.pd are part of the libdir +# convention. Help patches for each class and abstraction are supposed to be +# available. Makefile.pdlibbuilder does not force the presence of these files +# however. It does not automatically include such files in libdir installations. +# Data files you want to include in distributions must be defined explicitly in +# your Makefile. +# +# +#=== Makefile.pdlibbuilder syntax conventions ================================== +# +# +# Makefile.pdlibbuilder variable names are lower case. Default make variables, +# environment variables, and standard user variables (CC, CXX, CFLAGS, DESTDIR) +# are upper case. Use target 'allvars' to print all variables and their values. +# +# 'Fields' in data variables are separated by dots, like in 'foo.class.sources'. +# Words in variables expressing a function or command are separated by dashes, +# like in 'make-lib-executable'. +# +# +#=== useful make options ======================================================= +# +# +# Use 'make -d <target>' to print debug details of the make process. +# Use 'make -p <target>' to print make's database. +# +# +#=== TODO ====================================================================== +# +# +# - decide whether to use -static-libgcc or shared dll in MinGW +# - cygwin support +# - android support +# - Windows 64 bit support +# - figure out how to handle '$' in filenames +# - add makefile template targets dpkg-source dist libdir distclean tags? +# +# +#=== end of documentation sections ============================================= +# +# +################################################################################ +################################################################################ +################################################################################ + + +# GNU make version 3.81 (2006) or higher is required because of the following: +# - function 'info' +# - variable '.DEFAULT_GOAL' + +# force exit when make version is < 3.81 +ifneq ($(firstword $(sort 3.81 $(MAKE_VERSION))), 3.81) + $(error GNU make version 3.81 or higher is required) +endif + +# Relative path to externals root dir in multi-lib source tree like +# pd-extended SVN. Default is parent of current working directory. May be +# defined differently in including makefile. This variable is used to probe for +# paths. +externalsdir ?= .. + +# variable you can use to check if Makefile.pdlibbuilder is already included +Makefile.pdlibbuilder = true + + +################################################################################ +### variables: library name and version ######################################## +################################################################################ + + +# strip possibles spaces from lib.name, they mess up calculated file names +lib.name := $(strip $(lib.name)) + +# if meta file exists, check library version +metafile := $(wildcard $(lib.name)-meta.pd) + +ifdef metafile + lib.version := $(shell sed -n \ + 's|^\#X text [0-9][0-9]* [0-9][0-9]* VERSION \(.*\);|\1|p' \ + $(metafile)) +endif + + +################################################################################ +### variables: files ########################################################### +################################################################################ + + +#=== sources =================================================================== + + +# (re)define <classname>.class.sources using file names in class.sources + +define add-class-source +$(notdir $(basename $v)).class.sources += $v +endef + +$(foreach v, $(class.sources), $(eval $(add-class-source))) + +# derive class names from <classname>.class.sources variables +sourcevariables := $(filter %.class.sources, $(.VARIABLES)) +classes := $(basename $(basename $(sourcevariables))) + +# accumulate all source files specified in makefile +classes.sources := $(sort $(foreach v, $(sourcevariables), $($v))) +all.sources := $(classes.sources) $(lib.setup.sources) \ + $(shared.sources) $(common.sources) + + +#=== object files ============================================================== + + +# construct object filenames from all C and C++ source file names +classes.objects := $(addsuffix .o, $(basename $(classes.sources))) +common.objects := $(addsuffix .o, $(basename $(common.sources))) +shared.objects := $(addsuffix .o, $(basename $(shared.sources))) +lib.setup.objects := $(addsuffix .o, $(basename $(lib.setup.sources))) +all.objects = $(classes.objects) $(common.objects) $(shared.objects) \ + $(lib.setup.objects) + + +#=== executables =============================================================== + + +# use recursive variables here because executable extension is not yet known + +# construct class executable names from class names +classes.executables = $(addsuffix .$(extension), $(classes)) + +# construct shared lib executable name if shared sources are defined +ifdef shared.sources + shared.lib = lib$(lib.name).$(shared.extension) +else + shared.lib = +endif + + +################################################################################ +### variables per platform ##################################################### +################################################################################ + + +#=== flags per architecture ==================================================== + + +# Set architecture-dependent cflags, mainly for Linux. For Mac and Windows, +# arch.c.flags are overriden below. + +machine := $(shell uname -m) + +# Raspberry Pi 1st generation +ifeq ($(machine), armv6l) + arch.c.flags = -march=armv6 -mfpu=vfp -mfloat-abi=hard +endif + +# Beagle, Udoo, RPi2 etc. +ifeq ($(machine), armv7l) + arch.c.flags = -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard +endif + +# Intel 32 bit, build with SSE and SSE2 instructions +ifeq ($(findstring $(machine), i386 i686), $(machine)) + arch.c.flags = -march=pentium4 -mfpmath=sse -msse -msse2 +endif + +# Intel/AMD 64 bit, build with SSE, SSE2 and SSE3 instructions +ifeq ($(findstring $(machine), ia64 x86_64), $(machine)) + arch.c.flags = -march=core2 -mfpmath=sse -msse -msse2 -msse3 +endif + + +#=== operating system ========================================================== + + +# The following systems are defined: Linux, Darwin, Windows. GNU and +# GNU/kFreeBSD are treated as Linux to get the same options. System-specific +# multiline defines (optionally set in library makefile) are conditionally +# evaluated here. + +uname := $(shell uname) + +ifeq ($(findstring $(uname), Linux GNU GNU/kFreeBSD), $(uname)) + system = Linux + $(eval $(forLinux)) +endif + +ifeq ($(uname), Darwin) + system = Darwin + $(eval $(forDarwin)) +endif + +ifeq ($(findstring MINGW, $(uname)), MINGW) + system = Windows + $(eval $(forWindows)) +endif + +# TODO: Cygwin, Android + + +#=== flags and paths for Linux ================================================= + + +ifeq ($(system), Linux) + prefix = /usr/local + libdir := $(prefix)/lib + pkglibdir = $(libdir)/pd-externals + pdincludepath := $(firstword $(wildcard \ + $(externalsdir)/../pd/src \ + /usr/include/pdextended \ + /usr/include/pd)) + extension = pd_linux + cpp.flags := -DUNIX + c.flags := -fpic + c.ldflags := -rdynamic -shared -fpic -Wl,-rpath,"\$$ORIGIN",--enable-new-dtags + c.ldlibs := -lc -lm + cxx.flags := -fpic -fcheck-new + cxx.ldflags := -rdynamic -shared -fpic -Wl,-rpath,"\$$ORIGIN",--enable-new-dtags + cxx.ldlibs := -lc -lm -lstdc++ + shared.extension = so + shared.ldflags := -rdynamic -fpic -shared -Wl,-soname,$(shared.lib) + stripflags = --strip-unneeded -R .note -R .comment +endif + + +#=== flags and paths for Darwin ================================================ + + +# On OSX we try to build fat binaries by default. It is assumed that OSX i386 +# can build for ppc and OSX x86_64 can't. TODO: try to refine this condition. +# LLVM-clang doesn't support -fcheck-new, therefore this flag is omitted for +# OSX x86_64. + +ifeq ($(system), Darwin) + ifeq ($(macos_target),) + macos_target = 10.9 + endif + pkglibdir = $(HOME)/Library/Pd + pdincludepath := $(firstword $(wildcard \ + $(externalsdir)/../pd/src \ + /Applications/Pd-extended*.app/Contents/Resources/include/pdextended \ + /Applications/Pd*.app/Contents/Resources/src)) + extension = pd_darwin + cpp.flags := -DUNIX -DMACOSX -I /sw/include + c.flags := + c.ldflags := -undefined suppress -flat_namespace -bundle + c.ldlibs := -lc + cxx.ldflags := -undefined suppress -flat_namespace -bundle + cxx.ldlibs := -lc + shared.extension = dylib + shared.ldflags = -dynamiclib -undefined dynamic_lookup \ + -install_name @loader_path/$(shared.lib) \ + -compatibility_version 1 -current_version 1.0 + stripflags = -x + ifeq ($(machine), i386) + cxx.flags := -fcheck-new + arch.c.flags := -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=$(macos_target) + arch.ld.flags := -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=$(macos_target) + endif + ifeq ($(machine), x86_64) + arch.c.flags := -arch x86_64 -mmacosx-version-min=$(macos_target) + arch.ld.flags := -arch x86_64 -mmacosx-version-min=$(macos_target) + endif +endif + + +#=== flags and paths for Windows =============================================== + + +# Standard paths on Windows contain spaces, and GNU make functions treat such +# paths as lists, with unintended effects. Therefore we must use shell function +# ls instead of make's wildcard, and probe for each standard path individually. +# Using double quotes around paths with spaces is obligatory. Since some path +# variables are assembled or re-expanded later, great care must be taken to put +# quotes at appropriate points throughout the makefile. Thanks, Bill. + +# paths for 32-bit executables on 64-bit Windows aren't yet defined here (TODO) +ifeq ($(system), Windows) + pkglibdir := $(APPDATA)/Pd + pdbinpath := $(wildcard $(externalsdir)/../pd/bin) + pdincludepath := $(wildcard $(externalsdir)/../pd/src) + ifndef pdbinpath + pdbinpath := $(shell ls -d "$(PROGRAMFILES)/pd/bin") + endif + ifndef pdincludepath + pdincludepath := $(shell ls -d "$(PROGRAMFILES)/pd/include/pdextended") + endif + ifndef pdincludepath + pdincludepath := $(shell ls -d "$(PROGRAMFILES)/pd/src") + endif +endif + +# On Windows we build 32 bit by default to match Pd(-extended) binary +# distributions. This may change in the future. +# TODO: decide whether -mms-bitfields should be specified. +ifeq ($(system), Windows) + extension = dll + CC = gcc + CXX = g++ + arch.c.flags := -march=pentium4 -msse -msse2 -mfpmath=sse + cpp.flags := -DMSW -DNT + c.flags := + c.ldflags := -static-libgcc -shared \ + -Wl,--enable-auto-import "$(pdbinpath)/pd.dll" + c.ldlibs := + cxx.flags := -fcheck-new + cxx.ldflags := -static-libstdc++ -shared \ + -Wl,--enable-auto-import "$(pdbinpath)/pd.dll" + cxx.ldlibs := + shared.extension = dll + shared.ldflags := -static-libgcc -shared "$(pdbinpath)/pd.dll" + stripflags = --strip-unneeded -R .note -R .comment +endif + + +#=== paths ===================================================================== + + +# Default pkglibdir is specified above per operating system. It is aliased as +# 'objectsdir' to retain compatibility with pd-extended template. Assignment +# operator '?=' is used to enable a project-relative path definition in the +# including makefile. +objectsdir ?= $(pkglibdir) + +# base path where all components of the lib will be installed by default +installpath := $(DESTDIR)$(objectsdir)/$(lib.name) + +# check if pdincludepath contains spaces (as is often the case on Windows) +# if so, store the path so we can later do checks with it +pdincludepathwithspaces := $(if $(word 2, $(pdincludepath)), $(pdincludepath)) + + +#=== accumulated build flags =================================================== + + +# From GNU make docs: 'Users expect to be able to specify CFLAGS freely +# themselves.' So we use CFLAGS to define options which are not strictly +# required for compilation: optimizations, architecture specifications, and +# warnings. CFLAGS can be safely overriden using a make command argument. +# Variables cflags, ldflags and ldlibs may be defined in including makefile. + +optimization.flags = -O3 -ffast-math -funroll-loops -fomit-frame-pointer +warn.flags = -Wall -Wextra -Wshadow -Winline -Wstrict-aliasing + +# suppress -Wunused-variable & Co if you don't want to clutter a build log +ifdef suppress-wunused + warn.flags += $(addprefix -Wno-unused-, function parameter value variable) +endif + +CFLAGS = $(warn.flags) $(optimization.flags) $(arch.c.flags) + +# preprocessor flags +cpp.flags += -DPD -I "$(pdincludepath)" $(CPPFLAGS) + +# architecture specifications for linker are overridable by LDFLAGS +LDFLAGS := $(arch.ld.flags) + +# now add the same ld flags to shared dynamic lib +shared.ldflags := $(shared.ldflags) $(LDFLAGS) + +# accumulated flags for C compiler / linker +c.flags := $(cpp.flags) $(c.flags) $(cflags) $(CFLAGS) +c.ldflags := $(c.ldflags) $(ldflags) $(LDFLAGS) +c.ldlibs := $(c.ldlibs) $(ldlibs) + +# accumulated flags for C++ compiler / linker +cxx.flags := $(cpp.flags) $(cxx.flags) $(cflags) $(CFLAGS) +cxx.ldflags := $(cxx.ldflags) $(ldflags) $(LDFLAGS) +cxx.ldlibs := $(cxx.ldlibs) $(ldlibs) + + +################################################################################ +### variables: tools ########################################################### +################################################################################ + + +# aliases so we can later define 'compile-$1' and set 'c' or 'cxx' as argument +compile-c := $(CC) +compile-cxx := $(CXX) + + +################################################################################ +### checks ##################################################################### +################################################################################ + + +# At this point most variables are defined. Now do some checks and info's +# before rules begin. + +# 'forward declaration' of default target, needed to do checks +all: + +# To avoid unpredictable results, make sure the default target is not redefined +# by including makefile. +ifneq ($(.DEFAULT_GOAL), all) + $(error Default target must be 'all'.) +endif + +# find out which target(s) will be made +ifdef MAKECMDGOALS + goals := $(MAKECMDGOALS) +else + goals := all +endif + +# store path to Pd API m_pd.h if it is found +ifdef pdincludepath + mpdh := $(shell ls "$(pdincludepath)/m_pd.h") +endif + +# print Makefile.pdlibbuilder version +$(info ++++ info: using Makefile.pdlibbuilder version $(version)) + +# when making target all, check if m_pd.h is found and print info about it +ifeq ($(goals), all) + $(if $(mpdh), \ + $(info ++++ info: using Pd API $(mpdh)), \ + $(warning Where is Pd API m_pd.h? Do 'make help' for info.)) +endif + +# print target info +$(info ++++ info: making target $(goals) $(if $(lib.name),in lib $(lib.name))) + +# when installing, print installpath info +$(if $(filter install install-lib, $(goals)), $(info ++++ info: \ + installpath is '$(installpath)')) + + +#=== define executables ======================================================== + + +# By default we build class executables, and optionally a shared dynamic link +# lib. When make-lib-executable=yes we build all classes into a single lib +# executable, on the condition that variable lib.setup.sources is defined. + +ifeq ($(make-lib-executable),yes) + $(if $(lib.setup.sources), ,\ + $(error Can not build library blob because lib.setup.sources is undefined)) + executables := $(lib.name).$(extension) +else + executables := $(classes.executables) $(shared.lib) +endif + + +################################################################################ +### rules: special targets ##################################################### +################################################################################ + + +# Disable built-in rules. If some target can't be built with the specified +# rules, it should not be built at all. +MAKEFLAGS += --no-builtin-rules + +.PRECIOUS: +.SUFFIXES: +.PHONY: all post build-lib \ + $(classes) $(makefiledirs) $(makefiles) \ + install install-executables install-datafiles install-datadirs \ + force clean vars allvars depend help + + +################################################################################ +### rules: build targets ####################################################### +################################################################################ + + +# Target all forces the build of targets [$(executables) post] in +# deterministic order. Target $(executables) builds class executables plus +# optional shared lib or alternatively a single lib executable when +# make-lib-executable=true. Target post is optionally defined by +# library makefile. + +all: post +post: $(executables) + +all: + $(info ++++info: target all in lib $(lib.name) completed) + +# build all with -g option turned on for debug symbols +alldebug: c.flags += -g +alldebug: cxx.flags += -g +alldebug: all + + +#=== class executable ========================================================== + + +# recipe for linking objects in class executable +# argument $1 = compiler type (c or cxx) +# argument $2 = class basename +define link-class + $(compile-$1) \ + $($1.ldflags) $($2.class.ldflags) \ + -o $2.$(extension) \ + $(addsuffix .o, $(basename $($2.class.sources))) \ + $(addsuffix .o, $(basename $(common.sources))) \ + $($1.ldlibs) $($2.class.ldlibs) $(shared.lib) +endef + +# general rule for linking object files in class executable +%.$(extension): $(shared.lib) + $(info ++++ info: linking objects in $@ for lib $(lib.name)) + $(if $(filter %.cc %.cpp, $($*.class.sources)), \ + $(call link-class,cxx,$*), \ + $(call link-class,c,$*)) + + +#=== library blob ============================================================== + + +# build all classes into single executable +build-lib: $(lib.name).$(extension) + $(info ++++ info: library blob $(lib.name).$(extension) completed) + +# recipe for linking objects in lib executable +# argument $1 = compiler type (c or cxx) +define link-lib + $(compile-$1) \ + $($1.ldflags) $(lib.ldflags) \ + -o $(lib.name).$(extension) $(all.objects) \ + $($1.ldlibs) $(lib.ldlibs) +endef + +# rule for linking objects in lib executable +# declared conditionally to avoid name clashes +ifeq ($(make-lib-executable),yes) +$(lib.name).$(extension): $(all.objects) + $(if $(filter %.cc %.cpp, $(all.sources)), \ + $(call link-lib,cxx), \ + $(call link-lib,c)) +endif + + +#=== shared dynamic lib ======================================================== + + +# recipe for linking objects in shared executable +# argument $1 = compiler type (c or cxx) +define link-shared + $(compile-$1) \ + $(shared.ldflags) \ + -o lib$(lib.name).$(shared.extension) $(shared.objects) \ + $($1.ldlibs) $(shared.ldlibs) +endef + +# rule for linking objects in shared executable +# build recipe is in macro 'link-shared' +lib$(lib.name).$(shared.extension): $(shared.objects) + $(info ++++ info: linking objects in shared lib $@) + $(if $(filter %.cc %.cpp, $(shared.sources)), \ + $(call link-shared,cxx), \ + $(call link-shared,c)) + + +#=== object files ============================================================== + + +# recipe to make .o file from source +# argument $1 is compiler type (c or cxx) +define make-object-file + $(info ++++ info: making $@ in lib $(lib.name)) + $(compile-$1) \ + $($1.flags) \ + -o $@ -c $< +endef + +# Three rules to create .o files. These are double colon 'terminal' rules, +# meaning they are the last in a rules chain. + +%.o:: %.c + $(call make-object-file,c) + +%.o:: %.cc + $(call make-object-file,cxx) + +%.o:: %.cpp + $(call make-object-file,cxx) + + +#=== explicit prerequisites for class executables ============================== + + +# For class executables, prerequisite rules are declared in run time. Target +# 'depend' prints these rules for debugging purposes. + +# declare explicit prerequisites rule like 'class: class.extension' +# argument $v is class basename +define declare-class-target +$v: $v.$(extension) +endef + +# declare explicit prerequisites rule like 'class.extension: object1.o object2.o' +# argument $v is class basename +define declare-class-executable-target +$v.$(extension): $(addsuffix .o, $(basename $($v.class.sources))) \ + $(addsuffix .o, $(basename $(common.sources))) +endef + +# evaluate explicit prerequisite rules for all classes +$(foreach v, $(classes), $(eval $(declare-class-target))) +$(foreach v, $(classes), $(eval $(declare-class-executable-target))) + + +#=== implicit prerequisites for class executables ============================== + + +# Evaluating implicit prerequisites (header files) with help from the +# preprocessor is 'expensive' so this is done conditionally and selectively. +# Note that it is also possible to trigger a build via install targets, in +# which case implicit prerequisites are not checked. + +# When the Pd include path contains spaces it will mess up the implicit +# prerequisites rules. Also it is known that multiple arch flags are +# incompatible with preprocessor option -MM on OSX <= 10.5. Dependency +# tracking must be disabled in those cases. + +oldfat := $(and $(filter ppc i386, $(machine)), \ + $(filter-out 0 1, $(words $(filter -arch, $(c.flags))))) + +disable-dependency-tracking := $(strip $(pdincludepathwithspaces) $(oldfat)) + +ifndef disable-dependency-tracking + must-build-everything := $(filter all, $(goals)) + must-build-class := $(filter $(classes), $(goals)) + must-build-sources := $(foreach v, $(must-build-class), $($v.class.sources)) +endif + +# declare implicit prerequisites rule like 'object.o: header1.h header2.h ...' +# argument $1 is input source file(s) +# dir is explicitly added because option -MM strips it by default +define declare-object-target +$(dir $1)$(filter %.o: %.h, $(shell $(CPP) $(c.flags) -MM $1)) $(MAKEFILE_LIST) +endef + +# evaluate implicit prerequisite rules when rebuilding everything +ifdef must-build-everything + $(if $(wildcard $(all.objects)), \ + $(info ++++ info: evaluating implicit prerequisites in lib $(lib.name).....) \ + $(foreach v, $(all.sources), $(eval $(call declare-object-target, $v)))) +endif + +# evaluate implicit prerequisite rules when selectively building classes +ifdef must-build-class + $(foreach v, $(must-build-sources), \ + $(eval $(call declare-object-target, $v))) + $(foreach v, $(shared.sources), \ + $(eval $(call declare-object-target, $v))) +endif + + +################################################################################ +### rules: preprocessor and assembly files ##################################### +################################################################################ + + +# Preprocessor and assembly output files for bug tracing etc. They are not part +# of the build processes for executables. By default these files are created in +# the current working directory. Dependency tracking is not performed, the build +# is forced instead to make sure it's up to date. + +force: + + +#=== preprocessor file ========================================================= + + +# make preprocessor output file with extension .pre +# argument $1 = compiler type (c or cxx) +define make-preprocessor-file + $(info ++++ info: making preprocessor output file $(notdir $*.pre) \ + in current working directory) + $(compile-$1) -E $< $(c.flags) $($1.flags) -o $(notdir $*.pre) +endef + +%.pre:: %.c force + $(call make-preprocessor-file,c) + +%.pre:: %.cc force + $(call make-preprocessor-file,cxx) + +%.pre:: %.cpp force + $(call make-preprocessor-file,cxx) + + +#=== assembly file ============================================================= + + +# make C / assembly interleaved output file with extension .lst +# argument $1 = compiler type (c or cxx) +define make-assembly-file + $(info ++++ info: making assembly output file $(notdir $*.lst) \ + in current working directory) + $(compile-$1) \ + -c -Wa,-a,-ad -fverbose-asm \ + $($1.flags) \ + $< > $(notdir $*.lst) +endef + +%.lst:: %.c force + $(call make-assembly-file,c) + +%.lst:: %.cc force + $(call make-assembly-file,cxx) + +%.lst:: %.cpp force + $(call make-assembly-file,cxx) + + +################################################################################ +### rules: installation targets ################################################ +################################################################################ + + +# Install targets depend on successful exit status of target all because nothing +# must be installed in case of a build error. + + +# -p = preserve time stamps +# -m = set permission mode (as in chmod) +# -d = create all components of specified directories +INSTALL = install +INSTALL_PROGRAM := $(INSTALL) -p -m 644 +INSTALL_DATA := $(INSTALL) -p -m 644 +INSTALL_DIR := $(INSTALL) -m 755 -d + +# strip spaces from file names +executables := $(strip $(executables)) +datafiles := $(strip $(datafiles)) +datadirs := $(strip $(datadirs)) + +# Do not make any install sub-target with empty variable definition because the +# install program would exit with an error. +install: $(if $(executables), install-executables) +install: $(if $(datafiles), install-datafiles) +install: $(if $(datadirs), install-datadirs) + +install-executables: all + $(INSTALL_DIR) -v "$(installpath)" + $(INSTALL_PROGRAM) $(executables) "$(installpath)" + $(info ++++ info: executables of lib $(lib.name) installed \ + from $(CURDIR) to $(installpath)) + +install-datafiles: all + $(INSTALL_DIR) -v "$(installpath)" + $(INSTALL_DATA) $(datafiles) "$(installpath)" + $(info ++++ info: data files of lib $(lib.name) installed \ + from $(CURDIR) to $(installpath)) + +install-datadirs: all + $(foreach v, $(datadirs), $(INSTALL_DIR) "$(installpath)/$v";) + $(foreach v, $(datadirs), \ + $(INSTALL_DATA) $(wildcard $v/*) "$(installpath)/$v";) + $(info ++++ info: data directories of lib $(lib.name) installed \ + from $(CURDIR) to $(installpath)) + + +################################################################################ +### rules: distribution targets ################################################ +################################################################################ + + +# TODO +# These targets are implemented in Makefile Template, but I have to figure out +# how to do it under the not-so-strict conditions of Makefile.pdlibbuilder. + +# make source package +dist: + @echo "target dist not yet implemented" + +# make Debian source package +dpkg-source: + @echo "target dpkg-source not yet implemented" + +$(ORIGDIR): + +$(DISTDIR): + + +################################################################################ +### rules: clean targets ####################################################### +################################################################################ + + +# delete build products from build tree +clean: + rm -f $(all.objects) + rm -f $(classes.executables) $(lib.name).$(extension) $(shared.lib) + rm -f *.pre *.lst + +# remove distribution directories and tarballs from build tree +distclean: clean + @echo "target distclean not yet implemented" + + +################################################################################ +### rules: submake targets ##################################################### +################################################################################ + + +# Iterate over sub-makefiles or makefiles in other directories. + +# When 'continue-make=yes' is set, sub-makes will report 'true' to the parent +# process regardless of their real exit status. This prevents the parent make +# from being aborted by a sub-make error. Useful when you want to quickly find +# out which sub-makes from a large set will succeed. +ifeq ($(continue-make),yes) + continue = || true +endif + +# These targets will trigger sub-make processes for entries in 'makefiledirs' +# and 'makefiles'. +all alldebug install clean distclean dist dkpg-source: \ + $(makefiledirs) $(makefiles) + +# this expands to identical rules for each entry in 'makefiledirs' +$(makefiledirs): + $(MAKE) --directory=$@ $(MAKECMDGOALS) $(continue) + +# this expands to identical rules for each entry in 'makefiles' +$(makefiles): + $(MAKE) --directory=$(dir $@) --makefile=$(notdir $@) $(MAKECMDGOALS) $(continue) + + +################################################################################ +### rules: convenience targets ################################################# +################################################################################ + + +#=== show variables ============================================================ + + +# Several 'function' macro's cause errors when expanded within a rule or without +# proper arguments. Variables which are set with the define directive are only +# shown by name for that reason. +functions = \ +add-class-source \ +declare-class-target \ +declare-class-executable-target \ +declare-object-target \ +link-class \ +link-lib \ +link-shared \ +make-object-file \ +make-preprocessor-file \ +make-assembly-file + + +# show variables from makefiles +vars: + $(info ++++ info: showing makefile variables:) + $(foreach v,\ + $(sort $(filter-out $(functions) functions, $(.VARIABLES))),\ + $(if $(filter file, $(origin $v)),\ + $(info variable $v = $($v)))) + $(foreach v, $(functions), $(info 'function' name: $v)) + @echo + +# show all variables +allvars: + $(info ++++ info: showing default, automatic and makefile variables:) + $(foreach v, \ + $(sort $(filter-out $(functions) functions, $(.VARIABLES))), \ + $(info variable ($(origin $v)) $v = $($v))) + $(foreach v, $(functions), $(info 'function' name: $v)) + @echo + + +#=== show dependencies ========================================================= + + +# show generated prerequisites rules +depend: + $(info ++++ info: generated prerequisite rules) + $(foreach v, $(classes), $(info $(declare-class-target))) + $(foreach v, $(classes), $(info $(declare-class-executable-target))) + $(foreach v, $(all.sources), $(info $(call declare-object-target, $v))) + @echo + + +#=== show help text ============================================================ + + +# brief info about targets and paths + +ifdef mpdh + mpdhinfo := $(mpdh) +else + mpdhinfo := m_pd.h was not found. Is Pd(-extended) installed? +endif + +help: + @echo + @echo " Main targets:" + @echo " all: build executables (default target)" + @echo " install: install all components of the library" + @echo " vars: print makefile variables for troubleshooting" + @echo " allvars: print all variables for troubleshooting" + @echo " help: print this help text" + @echo + @echo " Pd API m_pd.h:" + @echo " $(mpdhinfo)" + @echo " You may specify your preferred Pd include path as argument to" + @echo " the make command, like 'pdincludepath=path/to/pd/src'." + @echo + @echo " Path for installation of your libdir(s):" + @echo " $(objectsdir)" + @echo " Alternatively you may specify your path for installation as argument" + @echo " to the make command, like 'objectsdir=path/to/pd-externals'." + @echo + @echo " Default paths are listed in the doc sections in Makefile.pdlibbuilder." + @echo + + +#=== dummy target ============================================================== + + +coffee: + @echo "Makefile.pdlibbuilder: Can not make coffee. Sorry." + + +################################################################################ +### end of rules sections ###################################################### +################################################################################ + + +# for syntax highlighting in vim and github +# vim: set filetype=make: + diff --git a/externals/bendinfix/README.md b/externals/bendinfix/README.md new file mode 100644 index 0000000000000000000000000000000000000000..215fdaacb5b242bd3a236a61d3a02e1d4e3f9eb8 --- /dev/null +++ b/externals/bendinfix/README.md @@ -0,0 +1,42 @@ + +# bendinfix + +This external provides a helper object to maintain compatibility between the bendin value ranges of different Pd flavors (specifically, vanilla Pd, pd-l2ork version 1, and purr-data a.k.a. pd-l2ork version 2+). + +Pd has a long-standing [bug](https://sourceforge.net/p/pure-data/bugs/1262/) in that its bendin object produces an unsigned value range of 0 thru 16383, while the bendout object expects a signed range of -8192 thru +8191. Which means that you have to translate the values when routing pitch bends from MIDI input to MIDI output. It also makes it harder to translate pitch bend input to frequency offsets. This bug has been there for such a long time that it now can't be fixed any more, to maintain backwards compatibility. + +However, other Pd flavors have in fact fixed this bug, specifically pd-l2ork and its successor purr-data. This actually made matters worse, though, since now Pd programmers have to cope with a variety of bendin implementations, which makes it hard to maintain interoperability between the different flavors if you need to process MIDI pitch bend events. + +The bendinfix external provides a solution that (1) provides a quick way to check which bendin implementation you have, (2) takes the output of the bendin object and translates it to the correct (signed) range, and (3) is binary-compatible with all modern Pd flavors. + +## Synopsis + +`[bendin]` takes signed or unsigned pitch bend values and translates them to signed values. + +- inlet #1: signed or unsigned pitch bend values, depending on your Pd flavor + +- outlet #1: output values are always signed, in the -8192 ... 8191 range + +- arguments: none + +## Usage + +(1) Passing 0 to bendinfix yields the value -8192 for a vanilla-compatible bendin, and 0 otherwise. Thus comparing the result against 0 gives you a flag determining whether you have a signed implementation: + + `[0( --- [bendinfix] --- [== 0]` yields 1 if signed, 0 if unsigned bendin implementation + +You can then use the computed flag in a patch to set it up for the pitch bend implementation at hand. + +(2) Simply routing the output of bendin into bendinfix yields the correct signed pitch bend values: + + `[bendin] --- [bendinfix]` yields signed bendin values in the -8192 ... 8191 range + +These can then be routed to bendout without further translation, or you can divide, e.g., by 4096, add a MIDI note number, and route the result through mtof to get a pitch bend range of +/- 2 semitones. + +Or, if you prefer to work with unsigned values, just add 8192 to the result of bendinfix. This will always give you unsigned values, even if your Pd flavor has a signed bendin implementation. + +## See Also + +- the infamous [bug #1262](https://sourceforge.net/p/pure-data/bugs/1262/) + +- doc/5.reference, midi (and bendin) help patches diff --git a/externals/bendinfix/bendinfix-help.pd b/externals/bendinfix/bendinfix-help.pd new file mode 100644 index 0000000000000000000000000000000000000000..323774ce2f25bdf013d24bb960e189c1a9ffaf94 --- /dev/null +++ b/externals/bendinfix/bendinfix-help.pd @@ -0,0 +1,34 @@ +#N canvas 696 372 460 365 12; +#X obj 22 263 bendinfix; +#X floatatom 22 292 5 0 0 0 - - -, f 5; +#X msg 78 233 0; +#X obj 22 233 bendin; +#X text 21 321 corrected pitch bend value (-8192 - 8191 range); +#X text 22 206 pitch bend input; +#X text 113 234 Passing 0 as input gives the amount by which the result +is shifted. This will be -8192 for a vanilla-compatible bendin implementation +\, 0 otherwise., f 46; +#N canvas 477 282 494 344 META 0; +#X text 12 5 KEYWORDS control MIDI; +#X text 12 25 LICENSE MIT; +#X text 12 85 INLET_0 float; +#X text 12 105 OUTLET_0 float; +#X text 12 129 AUTHOR Albert Gräf; +#X text 12 149 WEBSITE https://agraef.github.io/purr-data/; +#X text 12 169 RELEASE_DATE 2020; +#X text 12 192 HELP_PATCH_AUTHORS Albert Gräf; +#X text 12 45 DESCRIPTION translate bendin output to signed values +for all Pd flavors; +#X restore 380 335 pd META; +#X text 18 2 bendinfix - correct bendin values for all Pd flavors; +#X text 17 41 Background: Pd has a long-standing bug (which won't be +fixed due to backward compatibility concerns) in that its bendin range +(0 - 16383) doesn't match its bendout range (-8192 - 8191). The former +is what MIDI readily yields \, while the latter is more convenient +for translating pitch bends into frequency offsets. The bendinfix object +translates bendin's output to the correct (signed) range \, and works +across all Pd flavors \, including Pd-L2ork and Purr Data where bendin +returns a signed result by default.; +#X connect 0 0 1 0; +#X connect 2 0 0 0; +#X connect 3 0 0 0; diff --git a/externals/bendinfix/bendinfix.c b/externals/bendinfix/bendinfix.c new file mode 100644 index 0000000000000000000000000000000000000000..943ca87ea4e065de5c125f7db4889196589c0c59 --- /dev/null +++ b/externals/bendinfix/bendinfix.c @@ -0,0 +1,67 @@ + +// To compile on Linux: gcc --shared -fPIC -o bendinfix.pd_linux bendinfix.c + +#include <m_pd.h> + +static t_class *bendinfix_class; +static int *legacy, *legacy_bendin; +static void (*nw_gui_vmess)(const char *sel, char *fmt, ...); + +typedef struct _bendinfix { + t_object x_obj; +} t_bendinfix; + +void bendinfix_float(t_bendinfix *x, t_floatarg f) +{ + // vanilla default: + t_float g = 8192; + // exported symbols by the different Pd flavors: + // nw_gui_vmess => purr-data only + // legacy => pd-l2ork and purr-data + // legacy_bendin => purr-data with revised bendin implementation + if (legacy_bendin) + // signed bendin unless legacy_bendin is set + g = *legacy_bendin?8192:0; + else if (legacy) + // we always have a signed bendin with classic pd-l2ork (!nw_gui_vmess), + // whereas for purr-data without the revised bendin implementation + // (!legacy_bendin) bendin is signed, unless legacy is set + g = !nw_gui_vmess?0:*legacy?8192:0; + outlet_float(x->x_obj.ob_outlet, f-g); +} + +void *bendinfix_new(void) +{ + t_bendinfix *x = (t_bendinfix *)pd_new(bendinfix_class); + outlet_new(&x->x_obj, &s_float); + return (void *)x; +} + +#ifdef WIN32 +#include <windows.h> +#else +#define __USE_GNU // to get RTLD_DEFAULT +#include <dlfcn.h> // for dlsym +#ifndef RTLD_DEFAULT +/* If RTLD_DEFAULT still isn't defined then just passing NULL will hopefully + do the trick. */ +#define RTLD_DEFAULT NULL +#endif +#endif + +void bendinfix_setup(void) { + bendinfix_class = class_new(gensym("bendinfix"), + (t_newmethod)bendinfix_new, + 0, sizeof(t_bendinfix), + CLASS_DEFAULT, 0); + class_addfloat(bendinfix_class, bendinfix_float); +#ifdef WIN32 + legacy = (void*)GetProcAddress(GetModuleHandle("pd.dll"), "sys_legacy"); + legacy_bendin = (void*)GetProcAddress(GetModuleHandle("pd.dll"), "sys_legacy_bendin"); + nw_gui_vmess = (void*)GetProcAddress(GetModuleHandle("pd.dll"), "gui_vmess"); +#else + legacy = dlsym(RTLD_DEFAULT, "sys_legacy"); + legacy_bendin = dlsym(RTLD_DEFAULT, "sys_legacy_bendin"); + nw_gui_vmess = dlsym(RTLD_DEFAULT, "gui_vmess"); +#endif +} diff --git a/pd/doc/5.reference/bendin-help.pd b/pd/doc/5.reference/bendin-help.pd index 846a474440a22a9b12eda1d4137aa93284a51478..db15680bedc3e86f19d11195ca5cdc7c1a3620e0 100644 --- a/pd/doc/5.reference/bendin-help.pd +++ b/pd/doc/5.reference/bendin-help.pd @@ -1,10 +1,10 @@ -#N canvas 427 32 555 619 10; +#N canvas 508 58 560 619 10; #X obj 0 595 cnv 15 552 21 empty \$0-pddp.cnv.footer empty 20 12 0 -14 -228856 -66577 0; +14 #dcdcdc #404040 0; #X obj 0 0 cnv 15 552 40 empty \$0-pddp.cnv.header bendin 3 12 0 18 --204280 -1 0; -#X obj 0 395 cnv 3 550 3 empty \$0-pddp.cnv.inlets inlets 8 12 0 13 --228856 -1 0; +#c4dcdc #000000 0; +#X obj 0 365 cnv 3 550 3 empty \$0-pddp.cnv.inlets inlets 8 12 0 13 +#dcdcdc #000000 0; #N canvas 477 282 494 344 META 0; #X text 12 105 LIBRARY internal; #X text 12 145 WEBSITE http://crca.ucsd.edu/~msp/; @@ -21,16 +21,16 @@ to conform to the PDDP template for Pd version 0.42.; #X text 12 85 OUTLET_1 float; #X text 12 165 RELEASE_DATE 1997; #X restore 500 597 pd META; -#X obj 0 430 cnv 3 550 3 empty \$0-pddp.cnv.outlets outlets 8 12 0 -13 -228856 -1 0; -#X obj 0 495 cnv 3 550 3 empty \$0-pddp.cnv.argument arguments 8 12 -0 13 -228856 -1 0; +#X obj 0 400 cnv 3 550 3 empty \$0-pddp.cnv.outlets outlets 8 12 0 +13 #dcdcdc #000000 0; +#X obj 0 465 cnv 3 550 3 empty \$0-pddp.cnv.argument arguments 8 12 +0 13 #dcdcdc #000000 0; #X obj 0 560 cnv 3 550 3 empty \$0-pddp.cnv.more_info more_info 8 12 -0 13 -228856 -1 0; -#X text 98 439 float; +0 13 #dcdcdc #000000 0; +#X text 98 409 float; #N canvas 213 167 428 456 Related_objects 0; #X obj 1 1 cnv 15 425 20 empty \$0-pddp.cnv.subheading empty 3 12 0 -14 -204280 -1 0; +14 #c4dcdc #000000 0; #X text 7 1 [bendin] Related Objects; #X obj 75 89 ctlin; #X obj 25 116 pgmin; @@ -67,34 +67,58 @@ by Olaf Matthes); #X obj 186 365 chord; #X restore 101 597 pd Related_objects; #X obj 497 10 bendin; -#X text 98 405 (none); -#X obj 78 439 cnv 17 3 17 empty \$0-pddp.cnv.let.0 0 5 9 0 16 -228856 --162280 0; -#X obj 78 467 cnv 17 3 17 empty \$0-pddp.cnv.let.0 1 5 9 0 16 -228856 --162280 0; -#X text 98 467 float; -#X floatatom 148 171 5 0 0 0 - - -, f 5; -#X floatatom 191 171 5 0 0 0 - - -, f 5; -#X obj 148 144 bendin; -#X text 85 221 The [bendin] object reads incoming pitch bend values -and reports them. If started with no arguments it reports the channel -number through the right outlet.; -#X obj 260 144 bendin 2; -#X floatatom 260 171 5 0 0 0 - - -, f 5; -#X text 311 171 <-- pitch bend values on channel 2; +#X text 98 375 (none); +#X obj 78 409 cnv 17 3 17 empty \$0-pddp.cnv.let.0 0 5 9 0 16 #dcdcdc +#9c9c9c 0; +#X obj 78 437 cnv 17 3 17 empty \$0-pddp.cnv.let.0 1 5 9 0 16 #dcdcdc +#9c9c9c 0; +#X text 98 437 float; +#X floatatom 138 81 5 0 0 0 - - -, f 5; +#X floatatom 195 81 5 0 0 0 - - -, f 5; +#X obj 138 54 bendin; +#X obj 260 54 bendin 2; +#X floatatom 260 81 5 0 0 0 - - -, f 5; +#X text 311 81 <-- pitch bend values on channel 2; #X obj 99 564 pddp/pddplink all_about_midi_flags.pd -text all_about_midi_flags ; #X text 11 23 read incoming pitch bend values; -#X text 167 514 - (optional) a single MIDI channel number from which +#X text 167 484 - (optional) a single MIDI channel number from which to read. If the argument is present \, the [bendin] object does not show the second (right) outlet.; -#X text 168 405 - [bendin] reads directly from the MIDI port.; -#X text 168 439 - pitchbend value (a 14-bit integer).; -#X text 168 467 - MIDI channel number (available unless argument is +#X text 168 375 - [bendin] reads directly from the MIDI port.; +#X text 168 437 - MIDI channel number (available unless argument is given).; -#X text 80 514 1) float; +#X text 80 484 1) float; #X obj 4 597 pddp/pddplink all_about_help_patches.pd -text Usage Guide ; +#X floatatom 138 141 5 0 0 0 - - -, f 5; +#X floatatom 195 141 5 0 0 0 - - -, f 5; +#X floatatom 260 141 5 0 0 0 - - -, f 5; +#X obj 138 114 bendin 0 1; +#X obj 260 114 bendin 2 1; +#X text 80 531 2) float; +#X text 167 531 - (optional) flag. If nonzero \, [bendin] yields signed +output values (-8192 - 8191).; +#X text 168 409 - pitchbend value (signed range -8192 - 8191 by default). +; +#X text 37 120 unsigned values; +#X text 48 66 signed values; +#X text 7 135 (vanilla-compatible); +#X text 85 171 The [bendin] object reads incoming pitch bend values +and reports them. If invoked with no arguments (or a zero argument +meaning "omni") it reports the channel number through the right outlet. +; +#X text 85 233 CAVEAT: In pd-l2ork \, for consistency with bendout +\, bendin yields *signed* 14 bit values (-8192 - 8191) by default. +However \, for compatibility with vanilla pd \, you can also make bendin +use the *unsigned* 14 bit range (0 - 16384) by adding 1 (or any non-zero +value) as the second argument. This also becomes the default if the +-legacy-bendin option is specified on the command line. You can add +that option to the startup flags in the preferences if you need out-of-the-box +interoperability with vanilla Pd.; #X connect 16 0 14 0; #X connect 16 1 15 0; -#X connect 18 0 19 0; +#X connect 17 0 18 0; +#X connect 30 0 27 0; +#X connect 30 1 28 0; +#X connect 31 0 29 0; diff --git a/pd/doc/5.reference/bendout-help.pd b/pd/doc/5.reference/bendout-help.pd index 4960f50d19b8ff7394a8ca5a146509a70ccf1808..b4e58ea73a2affc130ba159b02b79fbe3502c9ad 100644 --- a/pd/doc/5.reference/bendout-help.pd +++ b/pd/doc/5.reference/bendout-help.pd @@ -1,10 +1,10 @@ -#N canvas 432 35 555 619 10; +#N canvas 432 38 556 623 10; #X obj 0 595 cnv 15 552 21 empty \$0-pddp.cnv.footer empty 20 12 0 -14 -228856 -66577 0; +14 #dcdcdc #404040 0; #X obj 0 0 cnv 15 552 40 empty \$0-pddp.cnv.header bendout 3 12 0 18 --204280 -1 0; +#c4dcdc #000000 0; #X obj 0 377 cnv 3 550 3 empty \$0-pddp.cnv.inlets inlets 8 12 0 13 --228856 -1 0; +#dcdcdc #000000 0; #N canvas 489 282 494 344 META 0; #X text 12 105 LIBRARY internal; #X text 12 145 WEBSITE http://crca.ucsd.edu/~msp/; @@ -22,15 +22,15 @@ to conform to the PDDP template for Pd version 0.42.; #X text 12 165 RELEASE_DATE 2009; #X restore 500 597 pd META; #X obj 0 458 cnv 3 550 3 empty \$0-pddp.cnv.outlets outlets 8 12 0 -13 -228856 -1 0; +13 #dcdcdc #000000 0; #X obj 0 486 cnv 3 550 3 empty \$0-pddp.cnv.argument arguments 8 12 -0 13 -228856 -1 0; +0 13 #dcdcdc #000000 0; #X obj 0 561 cnv 3 550 3 empty \$0-pddp.cnv.more_info more_info 8 12 -0 13 -228856 -1 0; +0 13 #dcdcdc #000000 0; #X text 98 387 float; #N canvas 204 206 441 421 Related_objects 0; #X obj 1 1 cnv 15 425 20 empty \$0-pddp.cnv.subheading empty 3 12 0 -14 -204280 -1 0; +14 #c4dcdc #000000 0; #X text 8 2 [bendout] Related Objects; #X obj 73 80 ctlin; #X obj 216 80 pgmin; @@ -65,10 +65,10 @@ by Olaf Matthes); #X obj 22 390 pddp/helplink cyclone/midiflush; #X restore 101 598 pd Related_objects; #X text 98 462 (none); -#X obj 78 387 cnv 17 3 35 empty \$0-pddp.cnv.let.0 0 5 9 0 16 -228856 --162280 0; -#X obj 78 430 cnv 17 3 17 empty \$0-pddp.cnv.let.0 1 5 9 0 16 -228856 --162280 0; +#X obj 78 387 cnv 17 3 35 empty \$0-pddp.cnv.let.0 0 5 9 0 16 #dcdcdc +#9c9c9c 0; +#X obj 78 430 cnv 17 3 17 empty \$0-pddp.cnv.let.0 1 5 9 0 16 #dcdcdc +#9c9c9c 0; #X text 98 430 float; #X obj 99 565 pddp/pddplink all_about_midi_flags.pd -text all_about_midi_flags ; @@ -83,14 +83,14 @@ by Olaf Matthes); #X text 168 505 - (optional) the MIDI channel number to be written to. If no argument is given \, [bendout] defaults to channel 1 . The channel can be changed by sending an integer to the right inlet.; -#X text 168 387 - pitchbend value (0-127).; #X text 168 430 - MIDI channel number (defaults to channel 1).; -#X text 168 462 - [bendin] writes directly to the MIDI port.; #X text 80 505 1) float; #X obj 4 597 pddp/pddplink all_about_help_patches.pd -text Usage Guide ; #X text 98 407 list; #X text 168 407 - a list is distributed to the inlets.; +#X text 168 387 - pitchbend value (-8192 - 8191).; +#X text 168 462 - [bendout] writes directly to the MIDI port.; #X connect 15 0 17 0; #X connect 16 0 17 1; #X connect 18 0 20 0; diff --git a/pd/src/s_main.c b/pd/src/s_main.c index 62ad4dc69ab4f64d511db9bfa4ff1a052d79625d..f3c3d14acdafffa73d94da0b39eff9d02219f228 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 c827ea7375cbd2a31eb08dfe3484ea5ca41217e7..2f75442d7ae752ce7d395c3142ccb91a0d3bfb36 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); }