From 9c4664d162c537ba4dd4fd8220971c0fb727103a Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@windfisch.org>
Date: Sun, 1 Jul 2012 16:42:16 +0000
Subject: final merge

---
 muse2/muse/osc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'muse2/muse/osc.cpp')

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;
   }
   
-- 
cgit v1.2.3