Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Resources/univorc.csd6
-rw-r--r--Util/CSoundClient.py1
-rw-r--r--Util/Trackpad.py4
3 files changed, 5 insertions, 6 deletions
diff --git a/Resources/univorc.csd b/Resources/univorc.csd
index b36735e..c81203b 100644
--- a/Resources/univorc.csd
+++ b/Resources/univorc.csd
@@ -661,7 +661,7 @@ iTrackId = int(p1-5001)
SvolTrackName sprintf "trackVolume%0d", iTrackId
kvol chnget SvolTrackName
kvol = kvol * 0.01
-kvol port kvol, .01
+kvol port kvol, .01, i(kvol)
idurfadein init 0.005
idurfadeout init 0.095
@@ -716,8 +716,8 @@ kls portk p13, igliss, p13
kle portk p14, igliss, p14
kcd portk p15, igliss, p15
-kpitchBend port gkTrackpadX, .03
-kampBend port gkTrackpadY, .03
+kpitchBend port gkTrackpadX, .03, i(gkTrackpadX)
+kampBend port gkTrackpadY, .03, i(gkTrackpadY)
a1 flooper2 1*(1+kampBend)+ktremolo, kpitch*(1+kpitchBend)+kvibrato, kls, kle, kcd, p8, 0, 0, 0, iskip
diff --git a/Util/CSoundClient.py b/Util/CSoundClient.py
index 66f5949..9374d13 100644
--- a/Util/CSoundClient.py
+++ b/Util/CSoundClient.py
@@ -150,7 +150,6 @@ class _CSoundClientPlugin:
else:
print 'ERROR: loopUpdate(): unsupported parameter change'
def loopPlay(self, dbnote, active):
- print 'INFO: adding note ', (dbnote.page<<16)+dbnote.id
qid = (dbnote.page << 16) + dbnote.id
sc_loop_addScoreEvent( qid, 1, active, 'i', self.csnote_to_array(dbnote.cs))
def play(self, csnote, secs_per_tick):
diff --git a/Util/Trackpad.py b/Util/Trackpad.py
index 894e479..8d92b4a 100644
--- a/Util/Trackpad.py
+++ b/Util/Trackpad.py
@@ -73,8 +73,8 @@ class Trackpad:
gtk.gdk.Display.warp_pointer(self.display, self.screen, self.screen.get_width() / 2, self.screen.get_height() / 2)
gtk.gdk.pointer_grab(self.win.window, event_mask = gtk.gdk.POINTER_MOTION_MASK, cursor = self.invisible_cursor)
self.buttonPressed = True
- self.first_x = self.current_x
- self.first_y = self.current_y
+ self.first_x = self.screen.get_width() / 2
+ self.first_y = self.screen.get_height() / 2
def handle_keyRelease(self,widget,event):
if KEY_MAP_PIANO.has_key(event.hardware_keycode):