summaryrefslogtreecommitdiff
path: root/libs/surfaces/osc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2009-07-21 15:55:17 +0000
committerCarl Hetherington <carl@carlh.net>2009-07-21 15:55:17 +0000
commitb65f8073ba306ac2d85133875746767e7c6b0eb6 (patch)
tree86e598b4cfe92aa8eaca558b85e1a4c397fa3f0e /libs/surfaces/osc
parentf41149628955fc8145bef6db0c110b71664c0a3a (diff)
Fix some unused parameter warnings.
git-svn-id: svn://localhost/ardour2/branches/3.0@5403 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/osc')
-rw-r--r--libs/surfaces/osc/interface.cc6
-rw-r--r--libs/surfaces/osc/osc.cc13
-rw-r--r--libs/surfaces/osc/osc.h6
-rw-r--r--libs/surfaces/osc/osc_controllable.cc2
4 files changed, 16 insertions, 11 deletions
diff --git a/libs/surfaces/osc/interface.cc b/libs/surfaces/osc/interface.cc
index de9154c80d..c8c559738e 100644
--- a/libs/surfaces/osc/interface.cc
+++ b/libs/surfaces/osc/interface.cc
@@ -23,7 +23,7 @@
using namespace ARDOUR;
ControlProtocol*
-new_osc_protocol (ControlProtocolDescriptor* descriptor, Session* s)
+new_osc_protocol (ControlProtocolDescriptor* /*descriptor*/, Session* s)
{
OSC* osc = new OSC (*s, Config->get_osc_port());
@@ -33,13 +33,13 @@ new_osc_protocol (ControlProtocolDescriptor* descriptor, Session* s)
}
void
-delete_osc_protocol (ControlProtocolDescriptor* descriptor, ControlProtocol* cp)
+delete_osc_protocol (ControlProtocolDescriptor* /*descriptor*/, ControlProtocol* cp)
{
delete cp;
}
bool
-probe_osc_protocol (ControlProtocolDescriptor* descriptor)
+probe_osc_protocol (ControlProtocolDescriptor* /*descriptor*/)
{
return true; // we can always do OSC
}
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 264ce74f49..e26e0f7b77 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -51,12 +51,17 @@ using namespace sigc;
using namespace std;
+#ifdef DEBUG
static void error_callback(int num, const char *m, const char *path)
{
-#ifdef DEBUG
fprintf(stderr, "liblo server error %d in path %s: %s\n", num, path, m);
-#endif
}
+#else
+static void error_callback(int, const char *, const char *)
+{
+
+}
+#endif
OSC::OSC (Session& s, uint32_t port)
: ControlProtocol (s, "OSC")
@@ -601,7 +606,7 @@ OSC::catchall (const char *path, const char *types, lo_arg **argv, int argc, lo_
}
void
-OSC::route_added (RouteList& rl)
+OSC::route_added (RouteList&)
{
}
@@ -726,7 +731,7 @@ OSC::session_exported( std::string path, std::string name ) {
/* path callbacks */
int
-OSC::current_value (const char *path, const char *types, lo_arg **argv, int argc, void *data, void* user_data)
+OSC::current_value (const char */*path*/, const char */*types*/, lo_arg **/*argv*/, int /*argc*/, void */*data*/, void* /*user_data*/)
{
#if 0
const char* returl;
diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index 4eebc906bb..2b6df6a80c 100644
--- a/libs/surfaces/osc/osc.h
+++ b/libs/surfaces/osc/osc.h
@@ -106,7 +106,7 @@ class OSC : public ARDOUR::ControlProtocol
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 **, int, void *) { \
name (); \
return 0; \
}
@@ -133,7 +133,7 @@ class OSC : public ARDOUR::ControlProtocol
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 *) { \
if (argc > 0) { \
name (optional argv[0]->type); \
} \
@@ -147,7 +147,7 @@ class OSC : public ARDOUR::ControlProtocol
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 *) { \
if (argc > 1) { \
name (argv[0]->arg1type, argv[1]->arg2type); \
} \
diff --git a/libs/surfaces/osc/osc_controllable.cc b/libs/surfaces/osc/osc_controllable.cc
index 9851daeb7e..3d3fefcac1 100644
--- a/libs/surfaces/osc/osc_controllable.cc
+++ b/libs/surfaces/osc/osc_controllable.cc
@@ -51,7 +51,7 @@ OSCControllable::get_state ()
}
int
-OSCControllable::set_state (const XMLNode& node)
+OSCControllable::set_state (const XMLNode& /*node*/)
{
return 0;
}