Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/Util/NoteLooper.py
diff options
context:
space:
mode:
authorjaberg <james@localhost.localdomain>2007-01-09 23:32:06 (GMT)
committer jaberg <james@localhost.localdomain>2007-01-09 23:32:06 (GMT)
commit28b5661e313b1d7564113b69faf49391a2b4ad8f (patch)
tree1f23cbc8304995661d6e3c726a7b45ab43130661 /Util/NoteLooper.py
parentb3d81b02d8cbdab7e148e440ced63579b2b26001 (diff)
tempo slider, NoteLooper::getTick
Diffstat (limited to 'Util/NoteLooper.py')
-rw-r--r--Util/NoteLooper.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/Util/NoteLooper.py b/Util/NoteLooper.py
index 7ee264a..ed05391 100644
--- a/Util/NoteLooper.py
+++ b/Util/NoteLooper.py
@@ -46,7 +46,7 @@ class NoteLooper:
secs_per_tick = 1.0 / ticks_per_sec
time_time = time.time()
- curtick = self.getTick( 0.0, False, time_time )
+ curtick = self.getTick( time_time, False )
curticktime = curtick * self.secs_per_tick + self.time0
self.ticks_per_sec = ticks_per_sec
@@ -60,16 +60,16 @@ class NoteLooper:
self.loops = 0
self.duration = duration
- def getTick(self, future , domod , t): #t is for time
+ def getTick(self, t, domod): #t is for time
if domod :
- return ( int( ( t + future - self.time0 ) * self.ticks_per_sec ) ) % self.duration
+ return ( int( ( t - self.time0 ) * self.ticks_per_sec ) ) % self.duration
else :
- return ( int( ( t + future - self.time0 ) * self.ticks_per_sec ) )
+ return ( int( ( t - self.time0 ) * self.ticks_per_sec ) )
def next( self ) :
time_time = time.time()
#tickhorizon is tick where we'll be after range_sec
- tickhorizon = self.getTick( self.range_sec, False, time_time )
+ tickhorizon = self.getTick( self.range_sec + time_time, False )
time0_time = self.time0 - self.time_start + self.DRIFT
if tickhorizon < 0 : return []
@@ -172,7 +172,7 @@ class NoteLooper:
insertMany()
else:
insertFew()
- self.hIdx = bisect.bisect_left(self.notes, self.getTick(self.range_sec, True, time.time()))
+ self.hIdx = bisect.bisect_left(self.notes, self.getTick(self.range_sec + time.time(), True))
def remove(self, note):
def removeFew():
@@ -190,7 +190,7 @@ class NoteLooper:
removeMany()
else:
removeFew()
- self.hIdx = bisect.bisect_left(self.notes, self.getTick(self.range_sec, True, time.time()))
+ self.hIdx = bisect.bisect_left(self.notes, self.getTick(self.range_sec + time.time(), True))
def clear(self):
self.notes = []