diff options
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/generic_midi/midicontrollable.cc | 1 | ||||
| -rw-r--r-- | libs/surfaces/osc/osc.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/osc/osc.h | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc index 426d730743..bae3201072 100644 --- a/libs/surfaces/generic_midi/midicontrollable.cc +++ b/libs/surfaces/generic_midi/midicontrollable.cc @@ -17,7 +17,6 @@ */ -#define __STDC_FORMAT_MACROS 1 #include <stdint.h> #include <cmath> #include <climits> diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 280959ae09..a76943156c 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -576,7 +576,7 @@ OSC::_catchall (const char *path, const char *types, lo_arg **argv, int argc, vo } int -OSC::catchall (const char *path, const char *types, lo_arg **argv, int argc, lo_message msg) +OSC::catchall (const char *path, const char* /*types*/, lo_arg **argv, int argc, lo_message msg) { size_t len; int ret = 1; /* unhandled */ diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 27c2e6ba03..4da22cf9e4 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -124,7 +124,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest> static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ } \ - int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *data) { \ + int cb_ ## name (const char *, const char *, lo_arg **, int, void *data) { \ name (data); \ return 0; \ } @@ -188,7 +188,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest> static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ } \ - int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \ + int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *data) { \ if (argc > 1) { \ name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type); \ } \ @@ -199,7 +199,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest> static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ } \ - int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \ + int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *data) { \ if (argc > 1) { \ name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type,argv[3]->arg4type); \ } \ |