Changeset 65

Timestamp:

16/02/10 21:15:17 (5 months ago)

Author:

st8

Message:

Added warping, currently selected track

Location:

trunk/LiveOSC

Files:

• LiveOSC.py (modified) (2 diffs)
• LiveOSCCallbacks.py (modified) (2 diffs)
• OSCAPI.txt (modified) (3 diffs)

trunk/LiveOSC/LiveOSC.py

@@ -52 +52 @@
     scenelisten = {}
     scene = 0
+    track = 0
 
     def __init__(self, c_instance):
@@ -247 +248 @@
             self.song().view.add_selected_scene_listener(self.scene_change)
 
+        if self.song().view.selected_track_has_listener(self.track_change) != 1:
+            self.song().view.add_selected_track_listener(self.track_change)
+
     def rem_scene_listeners(self):
         if self.song().view.selected_scene_has_listener(self.scene_change) == 1:
             self.song().view.remove_selected_scene_listener(self.scene_change)
+            
+        if self.song().view.selected_track_has_listener(self.track_change) == 1:
+            self.song().view.remove_selected_track_listener(self.track_change)
+
+    def track_change(self):
+        selected_track = self.song().view.selected_track
+        tracks = self.song().visible_tracks
+        index = 0
+        selected_index = 0
+        for track in tracks:
+            index = index + 1        
+            if track == selected_track:
+                selected_index = index
+                
+        if selected_index != self.track:
+            self.track = selected_index
+            self.oscServer.sendOSC("/live/track", (selected_index))
 
     def scene_change(self):

trunk/LiveOSC/LiveOSCCallbacks.py

@@ -119 +119 @@
         self.callbackManager.add(self.loopEndCB, "/live/clip/loopend_id")
         
+        self.callbackManager.add(self.warpingCB, "/live/clip/warping")
+        
         self.callbackManager.add(self.crossfaderCB, "/live/master/crossfader")
         self.callbackManager.add(self.trackxfaderCB, "/live/track/crossfader")
@@ -126 +128 @@
 
         self.callbackManager.add(self.selectionCB, "/live/selection")
+
+    def warpingCB(self, msg):
+        """ Called when a /live/clip/warping message is recieved
+        """
+        track = msg[2]
+        clip = msg[3]
+        
+        
+        if len(msg) == 4:
+            state = LiveUtils.getSong().visible_tracks[track].clip_slots[clip].clip.warping
+            self.oscServer.sendOSC("/live/clip/warping", (track, clip, int(state)))
+        
+        elif len(msg) == 5:
+            LiveUtils.getSong().visible_tracks[track].clip_slots[clip].clip.warping = msg[4]
 
     def selectionCB(self, msg):

trunk/LiveOSC/OSCAPI.txt

@@ -136 +136 @@
 /live/clip/loopstate_id (int track, int clip)                           Get the loop state of clip on track with the track and clip id /live/clip/loopstate_id (int track, int clip, int state)
 
+/live/clip/warping      (int track, int clip)                           Gets the warping state of the clip
+/live/clip/warping      (int track, int clip, int state)                Sets the warping state of the clip
 
 /live/master/crossfader                                                 Get the current crossfader position
@@ -146 +148 @@
 /live/return/crossfader (int return)                                    Gets the current cross fader assignment for return track track
 /live/return/crossfader (int return) (int assign)                       Sets the current cross fader assignment for return track track
+
+/live/selection (int tr_offset, int sc_offset, int width, int height)   Sets the dimensions and positions of the highlighted region in session view
 
 LISTENERS
@@ -180 +184 @@
 /live/tempo
 /live/scene
+/live/track
 
 /live/device/param (int track) (int device) (int param) (int value) (str name)