diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-05 14:22:32 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-05 14:22:32 -0400 |
| commit | 616f2a0370a10dcc7372a95f6bca9f5a45698980 (patch) | |
| tree | b07badccad237cc66d0668482ad65cedefdee23f /libs/surfaces | |
| parent | 499b7fcfa9f3e8535a4500143a9d7af7b67c6984 (diff) | |
| parent | 38e4f7bd1ba2ec9ae37dbb384da449f894cd8564 (diff) | |
fix conflicts after merge with master
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/osc/osc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 5c3422799b..84dd0d9c86 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -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 *, const char *, lo_arg **argv, int argc, void *data) { \ + int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *) { \ 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 *, const char *, lo_arg **argv, int argc, void *data) { \ + int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *) { \ if (argc > 1) { \ name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type,argv[3]->arg4type); \ } \ |