fix a few minor compilation warnings
fix error introduced during recent changes to Mackie control support, involving ambiguous enum usage
Merge branch 'master' into windows