# HG changeset patch # User drewp@bigasterisk.com # Date 2005-06-17 23:57:04 # Node ID e7630a2072bd4b8015eda52b7e7cdde04bb1a0f7 # Parent 77c39b6e71ab5b93702084d95b1cbdb7af23f94e awesome curvecalc control of ascoltami diff --git a/bin/curvecalc b/bin/curvecalc --- a/bin/curvecalc +++ b/bin/curvecalc @@ -42,6 +42,9 @@ class Music: pass#self.player=None d.addCallback(sendtime) return d + + def seekplay_or_pause(self,t): + self.player.callRemote('seekplay_or_pause',t) class Subexpr: curveset = None @@ -241,6 +244,7 @@ except IndexError: raise SystemExit("song name is required, e.g. '05-mix'") music=Music() +dispatcher.connect(lambda t: music.seekplay_or_pause(t),"music seek") zc = Zoomcontrol(root) zc.pack(side='top',fill='x') @@ -286,7 +290,7 @@ def savekey(*args): root.bind("",savekey) create_status_lines(root) -for helpline in ["Bindings: C-s save subterms; B1 drag point; C-B1 curve add point; 1..5 add point at time; Esc see current time; Mousewheel zoom", +for helpline in ["Bindings: C-s save subterms; B1 drag point; C-B1 curve add point; 1..5 add point at time; Esc see current time; S-Esc see curtime to end; Mousewheel zoom; C-p play/pause music at mouse", "Available in functions: nsin/ncos period=amp=1; within(a,b) bef(x) aft(x) compare to time; smoove(x) cubic smoothstep; curvename(t) eval curve"]: tk.Label(root,text=helpline, font="Helvetica -12 italic", anchor='w').pack(side='top',fill='x') diff --git a/light9/curve.py b/light9/curve.py --- a/light9/curve.py +++ b/light9/curve.py @@ -81,6 +81,9 @@ class Curveview(tk.Canvas): self.bind("",lambda ev: dispatcher.send("see time", t=self.current_time())) + self.bind("", lambda ev: + dispatcher.send("music seek", + t=self.world_from_screen(ev.x,0)[0])) # this binds on c-a-b1, etc RegionZoom(self, self.world_from_screen, self.screen_from_world)