Changeset 67

Timestamp:

19/02/10 09:55:27 (5 months ago)

Author:

st8

Message:

LiveOSC: Added meter listener for returns and master, clip position listener, clip name listener and clip color listener. Added calls for clip time signature

Location:

trunk/LiveOSC

Files:

• LiveOSC.py (modified) (5 diffs)
• LiveOSCCallbacks.py (modified) (2 diffs)
• OSCAPI.txt (modified) (1 diff)

trunk/LiveOSC/LiveOSC.py

@@ -47 +47 @@
     clisten = {}
     slisten = {}
+    pplisten = {}
+    cnlisten = {}
+    cclisten = {}
+    
     mlisten = { "solo": {}, "mute": {}, "arm": {}, "panning": {}, "volume": {}, "sends": {}, "name": {}, "oml": {}, "omr": {} }
     rlisten = { "solo": {}, "mute": {}, "panning": {}, "volume": {}, "sends": {}, "name": {} }
     masterlisten = { "panning": {}, "volume": {}, "crossfader": {} }
     scenelisten = {}
+    
     scene = 0
     track = 0
@@ -344 +349 @@
                 
         self.clisten = {}
+
+        for clip in self.pplisten:
+            if clip != None:
+                if clip.playing_position_has_listener(self.pplisten[clip]) == 1:
+                    clip.remove_playing_position_listener(self.pplisten[clip])
+                
+        self.pplisten = {}
+
+        for clip in self.cnlisten:
+            if clip != None:
+                if clip.name_has_listener(self.cnlisten[clip]) == 1:
+                    clip.remove_name_listener(self.cnlisten[clip])
+                
+        self.cnlisten = {}
+
+        for clip in self.cclisten:
+            if clip != None:
+                if clip.color_has_listener(self.cclisten[clip]) == 1:
+                    clip.remove_color_listener(self.cclisten[clip])
+                
+        self.cclisten = {}
         
     def add_clip_listeners(self):
@@ -364 +390 @@
             clip.add_playing_status_listener(cb)
             self.clisten[clip] = cb
+            
+        cb2 = lambda :self.clip_position(clip, tid, cid)
+        if self.pplisten.has_key(clip) != 1:
+            clip.add_playing_position_listener(cb2)
+            self.pplisten[clip] = cb2
+            
+        cb3 = lambda :self.clip_name(clip, tid, cid)
+        if self.cnlisten.has_key(clip) != 1:
+            clip.add_name_listener(cb3)
+            self.cnlisten[clip] = cb3
+
+        if self.cclisten.has_key(clip) != 1:
+            clip.add_color_listener(cb3)
+            self.cclisten[clip] = cb3
         
     def add_slotlistener(self, slot, tid, cid):
@@ -630 +670 @@
         
     # Clip Callbacks
+    def clip_name(self, clip, tid, cid):
+        self.oscServer.sendOSC('/live/name/clip', (tid, cid, str(clip.name), clip.color))
+    
+    def clip_position(self, clip, tid, cid):
+        if clip.is_playing:
+            self.oscServer.sendOSC('/live/clip/position', (tid, cid, clip.playing_position, clip.length, clip.loop_start, clip.loop_end))
+    
     def slot_changestate(self, slot, tid, cid):
         tmptrack = LiveUtils.getTrack(tid)
@@ -652 +699 @@
             if self.clisten.has_key(slot.clip) == 1:
                 slot.clip.remove_playing_status_listener(self.clisten[slot.clip])
+                
+            if self.pplisten.has_key(slot.clip) == 1:
+                slot.clip.remove_playing_position_listener(self.pplisten[slot.clip])
+
+            if self.cnlisten.has_key(slot.clip) == 1:
+                slot.clip.remove_name_listener(self.cnlisten[slot.clip])
+
+            if self.cclisten.has_key(slot.clip) == 1:
+                slot.clip.remove_color_listener(self.cclisten[slot.clip])
             
             self.oscServer.sendOSC('/live/track/info', (tid, armed, cid, 0, 0.0))

trunk/LiveOSC/LiveOSCCallbacks.py

@@ -121 +121 @@
         self.callbackManager.add(self.warpingCB, "/live/clip/warping")
         
+        self.callbackManager.add(self.sigCB, "/live/clip/signature")
+
         self.callbackManager.add(self.crossfaderCB, "/live/master/crossfader")
         self.callbackManager.add(self.trackxfaderCB, "/live/track/crossfader")
@@ -128 +130 @@
 
         self.callbackManager.add(self.selectionCB, "/live/selection")
+
+    def sigCB(self, msg):
+        """ Called when a /live/clip/signature message is recieved
+        """
+        track = msg[2]
+        clip = msg[3]
+        c = LiveUtils.getSong().visible_tracks[track].clip_slots[clip].clip
+        
+        if len(msg) == 4:
+            self.oscServer.sendOSC("/live/clip/signature", (track, clip, c.signature_numerator, c.signature_denominator))
+            
+        if len(msg) == 6:
+            self.oscServer.sendOSC("/live/clip/signature", 1)
+            c.signature_denominator = msg[5]
+            c.signature_numerator = msg[4]
 
     def warpingCB(self, msg):

trunk/LiveOSC/OSCAPI.txt

@@ -162 +162 @@
 /live/track/info
 /live/clip/info
-/live/clip/position
+/live/clip/position (int track) (int clip) (float position) (float length) (float loop_start) (float loop_end)
 
 /live/name/return
 /live/name/track
-/live/name/clip
+/live/name/clip (returns on colour and name changes)
 
 /live/arm