Changeset 12

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

Files:

• LiveControl/RemixNet.py (modified) (1 diff)
• LiveOSC/LiveOSC.py (modified) (1 diff)
• LiveOSC/LiveOSCCallbacks.py (modified) (2 diffs)
• LiveOSC/OSCAPI.txt (modified) (1 diff)
• LiveOSC/RemixNet.py (modified) (1 diff)
• LiveOSC/__init__.py (modified) (1 diff)
• TouchOSC/TouchOSC.py (modified) (5 diffs)
• TouchOSC/touchosc_config.txt (added)

trunk/LiveControl/RemixNet.py

@@ -59 +59 @@
        # 10.5
         try:
-            file = open("/usr/lib/python2.5/string.py")
+            file = open("/usr/lib/python2.5/string.pyc")
         except IOError:
-            exists = 0
             sys.path.append("/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5")
+            import socket_live8 as socket  
         else:
             sys.path.append("/usr/lib/python2.5")
-
-        import socket_live8 as socket     
+            import socket
 
 import OSC 

trunk/LiveOSC/LiveOSC.py

@@ -29 +29 @@
 
 import Live
-import socket
 import LiveOSCCallbacks
 import RemixNet

trunk/LiveOSC/LiveOSCCallbacks.py

@@ -254 +254 @@
             for track in LiveUtils.getTracks():
                 for clipSlot in track.clip_slots:
-                    if clipSlot:
-                        self.oscServer.sendOSC("/live/name/clip", (trackNumber, clipNumber, str(clipSlot.clip.name)))
+                    if clipSlot.clip != None:
+                        self.oscServer.sendOSC("/live/name/clip", (trackNumber, clipNumber, str(clipSlot.clip.name), str(clipSlot.clip.color_index)))
                     clipNumber = clipNumber + 1
                 clipNumber = 0
                 trackNumber = trackNumber + 1
             return
-        #Requesting a single scene name
+        #Requesting a single clip name
         if len(msg) == 4:
             trackNumber = msg[2]
             clipNumber = msg[3]
-            self.oscServer.sendOSC("/live/name/clip", (trackNumber, clipNumber, str(LiveUtils.getClip(trackNumber, clipNumber).name)))
-            return
-        #renaming a scene
+            self.oscServer.sendOSC("/live/name/clip", (trackNumber, clipNumber, str(LiveUtils.getClip(trackNumber, clipNumber).name), str(LiveUtils.getClip(trackNumber, clipNumber).color_index)))
+            return
+        #renaming a clip
         if len(msg) == 5:
             trackNumber = msg[2]
@@ -419 +419 @@
         /live/track/info     (int track)   Returns clip slot status' for all clips in a track in the form /live/track/info (tracknumber, armed  (clipnumber, state, length))
                                            [state: 1 = Has Clip, 2 = Playing, 3 = Triggered]
-        """        
-        tracknum = -1
+        """
+        
         clipslots = LiveUtils.getClipSlots()
         
-        for track in clipslots:
+        new = []
+        if len(msg) == 3:
+            new.append(clipslots[msg[2]])
+            tracknum = msg[2] - 1
+        else:
+            new = clipslots
+            tracknum = -1
+        
+        for track in new:
             tracknum = tracknum + 1
             clipnum = -1

trunk/LiveOSC/OSCAPI.txt

@@ -23 +23 @@
 /live/name/scene        (int scene)                                     Returns a single scene's name in the form /live/name/scene (int scene, string name)
 /live/name/scene        (int scene, string name)                        Sets scene number scene's name to name
-/live/name/track                                                        Returns a a series of all the track names in the form /live/name/track (int track, string name)
-/live/name/track        (int track)                                     Returns a single track's name in the form /live/name/track (int track, string name)
+/live/name/track                                                        Returns a a series of all the track names in the form /live/name/track (int track, string name, int color)
+/live/name/track        (int track)                                     Returns a single track's name in the form /live/name/track (int track, string name, int color)
 /live/name/track        (int track, string name)                        Sets track number track's name to name
 /live/name/clip                                                         Returns a a series of all the clip names in the form /live/name/clip (int track, int clip, string name)

trunk/LiveOSC/RemixNet.py

@@ -59 +59 @@
        # 10.5
         try:
-            file = open("/usr/lib/python2.5/string.py")
+            file = open("/usr/lib/python2.5/string.pyc")
         except IOError:
-            exists = 0
             sys.path.append("/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5")
+            import socket_live8 as socket  
         else:
             sys.path.append("/usr/lib/python2.5")
-
-        import socket_live8 as socket     
+            import socket
 
 import OSC 

trunk/LiveOSC/__init__.py

@@ -20 +20 @@
 """
 
-#import sys
-import Live
+import sys
+#import Live
     
-#path = "/Live 8.0.3 OS X/Live.app/Contents/App-Resources/MIDI Remote Scripts/LiveOSC"
-#errorLog = open(path + "/stderr.txt", "w")
-#errorLog.write("Starting Error Log")
-#sys.stderr = errorLog
-#stdoutLog = open(path + "/stdout.txt", "w")
-#stdoutLog.write("Starting Standard Out Log")
-#sys.stdout = stdoutLog
+path = "/Live 8.0.3 OS X/Live.app/Contents/App-Resources/MIDI Remote Scripts/LiveOSC"
+errorLog = open(path + "/stderr.txt", "w")
+errorLog.write("Starting Error Log")
+sys.stderr = errorLog
+stdoutLog = open(path + "/stdout.txt", "w")
+stdoutLog.write("Starting Standard Out Log")
+sys.stdout = stdoutLog
 
 from LiveOSC import LiveOSC

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))
+