merge changes to libmidi++ API from 2.0-ongoing