Changeset 12 for trunk/TouchOSC

Timestamp:

03/07/09 15:23:23 (14 months ago)

Author:

st8

Message:

Added nyquists remixnet fixes, fixed problems with a number of LiveOSC commands. Added fully working TouchOSC script with config file

Location:

trunk/TouchOSC

Files:

• TouchOSC.py (modified) (5 diffs)
• touchosc_config.txt (added)

trunk/TouchOSC/TouchOSC.py

@@ -8 +8 @@
 import OSC
 import re
+import os
 from Logger import Logger
 
@@ -23 +24 @@
         self.log("Logging Enabled")
         
-        ip = RemixNet.get_ip()
-        self.log("Ableton IP: " + str(ip))
-        
-        self.oscServer = RemixNet.OSCServer(ip, 5001, None, 5000)
-        self.callbackManager = self.oscServer.callbackManager
-        self.oscServer.sendOSC('/touchosc/startup', 1)
-        
-        self.c_instance.show_message("TouchOSC > Server Started on " + str(ip))
+        local = RemixNet.get_ip()
+        self.log("Ableton IP: " + str(local))
         
         # Init all listeners
         self.cc = []
-        config = open('config.txt', 'r')
+        self.cache = []
+        
+        config = open(os.path.expanduser('~') + '/touchosc_config.txt', 'r')
 
+        first = 0
         for line in config:
-            (page, item) = line.rsplit("/")
-            #item = re.sub("/\d^/", "", item)
+            line = line.rstrip()
             
-            if item == "rotary" or item == "toggle" or item == "fader" or item == "push":
-                pass
-            else if item == "xy":
-                pass
-            else if item == "multitoggle":
-                pass
-            else if item == "multifader":
-                pass
+            # First line is remote ip address
+            if first == 0:
+                remote = line
+                self.oscServer = RemixNet.OSCServer(remote, 5001, local, 5000)
+                self.callbackManager = self.oscServer.callbackManager
+                self.oscServer.sendOSC('/touchosc/startup', 1)  
+                
+                first = 1
+            else:
+                if re.search("xy", line):
+                    self.cc.append(line)
+                    self.cc.append(line)
+                    self.cache.append(0)
+                    self.cache.append(0)
+                else:
+                    self.cc.append(line)
+                    self.cache.append(0)
+          
+                self.callbackManager.add(self.callback, line)
             
         config.close()
-
         
-        for page in range(4):
-            for item in ("fader", "toggle", "xy", "push", "rotary"):
-                for no in range(6):
-                    string = "/" + str(page) + "/" + str(item) + str(no)
-                    self.cc.append(string)
-                    self.callbackManager.add(self.callback, string)
+        self.c_instance.show_message("TouchOSC > Server Started on " + str(local) + ", sending data to: " + str(remote))        
+                                
+        self.song().add_current_song_time_listener(self.oscServer.processIncomingUDP)
 
 ######################################################################    
@@ -75 +79 @@
 
     def build_midi_map(self, midi_map_handle):
-        return
+        for i in range(0,20):
+            Live.MidiMap.forward_midi_cc(self.handle(), midi_map_handle, 0, i)
   
         def send_midi(self, midi_bytes):
                 self.c_instance.send_midi(midi_bytes)
 
-    def receive_midi(self, midi_bytes):
-        return
+    def receive_midi(self, bytes):
+        cc = self.cc[bytes[1]]
+        val = float(bytes[2])/float(127)
+        
+        if re.search("xy", cc):
+            self.cache[bytes[1]] = bytes[2]
+            xy1 = self.tuple_idx(self.cc, cc)
+            
+            if bytes[1] == xy1:
+                val2 = float(self.cache[bytes[1] + 1])/float(127)
+                self.oscServer.sendOSC(str(self.cc[bytes[1]]), (val, val2))
+            else:
+                val2 = float(self.cache[bytes[1] - 1])/float(127)
+                self.oscServer.sendOSC(str(self.cc[bytes[1]]), (val2, val))
+                
+                self.log("cc: " + str(bytes[1]) + " val: " + str(val) + " cc2: " + str((bytes[1] - 1)) + " val2: " + str(val2) + " control: " + str(self.cc[bytes[1]]))     
+
+        else:
+            self.log("cc: " + str(bytes[1]) + " val: " + str(bytes[2]) + " control: " + str(self.cc[bytes[1]]))
+            self.oscServer.sendOSC(str(self.cc[bytes[1]]), val)
 
     def can_lock_to_devices(self):
@@ -91 +114 @@
     def suggest_output_port(self):
         return ''
+
+    def suggest_map_mode(self, cc_no, channel):
+        return Live.MidiMap.MapMode.absolute
 
     def __handle_display_switch_ids(self, switch_id, value):
@@ -127 +153 @@
 # Main Touch OSC Functions 
     def callback(self, msg):
-        (page, item) = msg[0].rsplit("/")
-        item = re.sub("/\d^/", "", item)
+        if re.search("xy", msg[0]):
+            cc = self.tuple_idx(self.cc, msg[0])
+            
+            val = int(msg[2] * 127)
+            val2 = int(msg[3] * 127)
+            
+            if abs(self.cache[cc] - val) > 0:
+                self.c_instance.send_midi((0xb0, cc, val))
+                self.cache[cc] = val
+                
+                self.log(str(msg[0]) + " cc: " + str(cc) + " val: " + str(val))
+                
+            if abs(self.cache[cc+1] - val2) > 0:
+                self.c_instance.send_midi((0xb0, cc + 1, val2))
+                self.log(str(msg[0]) + " cc2: " + str(cc+1) + " val2: " + str(val2))
+                
+                self.cache[cc+1] = val2
+
+        else:
+            cc = self.tuple_idx(self.cc, msg[0])
+            val = int(msg[2] * 127)
         
-        if item == "rotary" or item == "toggle" or item == "fader" or item == "push" or item == "multitoggle" or item == "multifader":
-            pass
-            
-        else if item == "xy":
-            pass    
-        
-        cc = self.tuple_idx(self.cc, msg[0])
-        val = int(msg[2] * 127)
-        
-        self.log(str(msg[0]) + " cc: " + str(cc) + " val: " + str(val))
-        self.c_instance.send_midi((0xb0, cc, val))
+            self.c_instance.send_midi((0xb0, cc, val))
 
+            self.log(str(msg[0]) + " cc: " + str(cc) + " val: " + str(val))
+