Changeset 22 for trunk/TouchOSC_LC

Timestamp:

05/07/09 12:00:40 (14 months ago)

Author:

st8

Message:

LiveOSC:
Added return and master track listeners and calls (see documentation for implementation)
Added device parameters
/live/send <Track> now returns a list of sends and values

TouchOSC_LC
Page 3 now automatically maps to sends and allows toggling and inter-send routing

TouchOSC
Updated LiveControl TouchOSC layout and corresponding config file

File:

• trunk/TouchOSC_LC/TouchOSC.py (modified) (3 diffs)

trunk/TouchOSC_LC/TouchOSC.py

@@ -17 +17 @@
     # Enable Logging
     _LOG = 0
+    
+    # Track offset
+    tos = 7
 
     def __init__(self, c_instance):
@@ -61 +64 @@
         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)
+        #self.song().add_current_song_time_listener(self.oscServer.processIncomingUDP)
 
 ######################################################################    
@@ -153 +156 @@
 # Main Touch OSC Functions 
     def callback(self, msg):
-        if re.search("xy", msg[0]):
+        # Sends handler
+        if re.search("/3/multitoggle1/", msg[0]):
+            ids = msg[0].split('/')
+        
+            ret = 5 - int(ids[3])
+            sid = int(ids[4]) - 1
+            
+            if sid >= ret:
+                sid = sid + 1
+            
+            self.log("row: " + str(ret) + " col:" + str(sid))
+        
+            track = self.song().return_tracks[ret]
+            track.mixer_device.sends[sid].value = msg[2]        
+        
+        
+        elif re.search("/3/push", msg[0]):
+            id  = int(msg[0].replace("/3/push", "")) - 1
+            
+            tr  = (id % 6) + self.tos
+            sid = (id / 6)   
+            
+            track = self.song().tracks[tr]
+            track.mixer_device.sends[sid].value = msg[2]
+        
+        elif re.search("/3/toggle", msg[0]):
+            id  = int(msg[0].replace("/3/toggle", "")) - 1
+            
+            tr  = (id % 6) + self.tos
+            sid = (id / 6) + 2
+            
+            self.log("tr: " + str(tr) + " send: " + str(sid))
+            
+            track = self.song().tracks[tr]
+            
+            # Sends
+            track.mixer_device.sends[sid].value = msg[2]
+ 
+            tot = 0
+            for s in range(2, len(track.mixer_device.sends)):
+                tot += track.mixer_device.sends[s].value
+
+            if tot > 0:
+                track.mixer_device.volume.value = 0
+            else:
+                track.mixer_device.volume.value = 0.85
+    
+        elif re.search("xy", msg[0]):
             cc = self.tuple_idx(self.cc, msg[0])