diff options
author | Nat <natcl@hotmail.com> | 2007-09-22 16:13:43 (GMT) |
---|---|---|
committer | Nat <natcl@hotmail.com> | 2007-09-22 16:13:43 (GMT) |
commit | 909f5ebf9f4b5b75b601c6d0a13ee01f71af1664 (patch) | |
tree | faf2f7b4da23e769e7bf771d337defcb9e923a58 /common/Util | |
parent | de3b12336b5a7ed8fe183fe76dccc240b62e6c9e (diff) | |
parent | 0f7aa3a00e134af329c202693d0fbc35ee69bbc0 (diff) |
Merge branch 'master' of git+ssh://natcl@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'common/Util')
-rw-r--r-- | common/Util/Block.py | 2 | ||||
-rw-r--r-- | common/Util/ControlStream.py | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/common/Util/Block.py b/common/Util/Block.py index 9b1abea..b1395b8 100644 --- a/common/Util/Block.py +++ b/common/Util/Block.py @@ -569,6 +569,8 @@ class Loop(Block): self.owner.getLoopImage( self.data["id"], True ) ] def destroy( self ): + if self.active: + self.owner.deactivateLoop( self ) if self.keyActive: self.owner.mapKey( None, self, self.data["key"] ) self.owner.noteDB.deletePages( [ self.data["id"] ] ) diff --git a/common/Util/ControlStream.py b/common/Util/ControlStream.py index de72fe2..4eeabc1 100644 --- a/common/Util/ControlStream.py +++ b/common/Util/ControlStream.py @@ -75,6 +75,9 @@ class TamTamOStream: def desktop_set( self, id ): self.file.write( "desktop_set %d\n" % id ) + def sync_beats( self, beats ): + self.file.write( "sync_beats %d\n" % beats ) + class TamTamTable: def __init__(self, noteDB = None, jam = None ): @@ -95,6 +98,7 @@ class TamTamTable: 'block_add':self.block_add, 'desktop_store':self.desktop_store, 'desktop_set':self.desktop_set, + 'sync_beats':self.sync_beats, 'sleep':self.sleep, 'quit':self.quit} @@ -215,6 +219,9 @@ class TamTamTable: def desktop_set( self, argv ): self.jam.setDesktop( int( argv[0] ), True ) + def sync_beats( self, argv ): + self.jam.setSyncBeats( int( argv[0] ) ) + def sleep(self, argv): t = float(argv[0]) print 'sleeping for %i seconds' % t |