summaryrefslogtreecommitdiff
path: root/muse2/muse/osc.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-07-01 16:42:16 +0000
committerFlorian Jung <flo@windfisch.org>2012-07-01 16:42:16 +0000
commit9c4664d162c537ba4dd4fd8220971c0fb727103a (patch)
tree37a28b7cd4e4d8984ad4934a4884cd7b4da0505c /muse2/muse/osc.cpp
parente87fedf1be804f7ec774071d844b1f163be30b96 (diff)
final merge
Diffstat (limited to 'muse2/muse/osc.cpp')
-rw-r--r--muse2/muse/osc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/muse2/muse/osc.cpp b/muse2/muse/osc.cpp
index 0d4a1750..381e4acc 100644
--- a/muse2/muse/osc.cpp
+++ b/muse2/muse/osc.cpp
@@ -1092,7 +1092,7 @@ int OscDssiIF::oscControl(lo_arg** argv)
if(_oscSynthIF)
{
_oscSynthIF->oscControl(argv[0]->i, argv[1]->f);
- if (port<maxDssiPort)
+ if (port<(int)maxDssiPort)
old_control[control_port_mapper->at(port)]=argv[1]->f;
}
@@ -1170,7 +1170,7 @@ int OscEffectIF::oscControl(lo_arg** argv)
if(_oscPluginI)
{
_oscPluginI->oscControl(argv[0]->i, argv[1]->f);
- if (port<maxDssiPort)
+ if (port<(int)maxDssiPort)
old_control[control_port_mapper->at(port)]=argv[1]->f;
}