Merge branch 'master' of git+ssh://natcl@dev.laptop.org/git/projects/tamtam

5 files changed, 13 insertions, 1 deletions

diff --git a/common/Resources/Desktops/desktop0 b/common/Resources/Desktops/desktop0
index 0dd6fd1..0dd6e68 100644
--- a/common/Resources/Desktops/desktop0
+++ b/common/Resources/Desktops/desktop0
@@ -3798,3 +3798,4 @@ block_add Instrument False 291 328 False {'volume': 0.5, 'reverb': 0, 'name': 'r
 block_add Loop False 386 328 True {'beats': 4, 'regularity': 0.80000000000000004, 'id': 197, 'key': 20, 'name': 'loop04_0'}
 block_add Loop False 463 328 True {'beats': 2, 'regularity': 0.80000000000000004, 'id': 190, 'key': None, 'name': 'loop02_0'}
 block_add Loop False 517 328 True {'beats': 2, 'regularity': 0.80000000000000004, 'id': 189, 'key': None, 'name': 'loop02_0'}
+sync_beats 4
diff --git a/common/Resources/Desktops/desktop1 b/common/Resources/Desktops/desktop1
index 610444b..d51da98 100644
--- a/common/Resources/Desktops/desktop1
+++ b/common/Resources/Desktops/desktop1
@@ -6171,7 +6171,7 @@ note_add 9 327 0 27 38 0.737997319594 0.5 1.0 5 137 0.005 0.095 0.0 0.0 1000.0 1
 note_add 10 327 0 27 42 0.671027963479 0.5 1.0 5 137 0.005 0.095 0.0 0.0 1000.0 1 mini
 note_add 11 327 0 33 40 0.727866267806 0.5 1.0 5 137 0.005 0.095 0.0 0.0 1000.0 1 mini
 note_add 12 327 0 33 48 0.674593053365 0.5 1.0 5 137 0.005 0.095 0.0 0.0 1000.0 1 mini
-block_add Drum False 137 118 False {'name': 'drum5kit', 'regularity': 0.80000000000000004, 'id': 139, 'volume': 0.5, 'beats': 10, 'key': 61, 'reverb': 0.0, 'page': 235}
+block_add Drum False 137 118 False {'name': 'drum1kit', 'regularity': 0.80000000000000004, 'id': 135, 'volume': 0.5, 'beats': 10, 'key': 61, 'reverb': 0.0, 'page': 235}
 block_add Instrument False 283 88 False {'volume': 0.5, 'reverb': 0, 'name': 'piano', 'pan': 0.5, 'id': 28}
 block_add Loop False 470 88 True {'key': 18, 'beats': 12, 'name': 'loop12_0', 'regularity': 0.80000000000000004, 'id': 239}
 block_add Loop False 731 88 True {'key': None, 'beats': 10, 'name': 'loop10_0', 'regularity': 0.80000000000000004, 'id': 234}
@@ -6188,3 +6188,4 @@ block_add Instrument True 284 426 False {'volume': 0.5, 'reverb': 0, 'name': 'pi
 block_add Loop False 471 426 True {'key': 21, 'beats': 12, 'name': 'loop12_3', 'regularity': 0.80000000000000004, 'id': 236}
 block_add Loop False 732 426 True {'key': None, 'beats': 10, 'name': 'loop10_3', 'regularity': 0.80000000000000004, 'id': 231}
 block_add Loop False 947 426 True {'key': None, 'beats': 8, 'name': 'loop08_4', 'regularity': 0.80000000000000004, 'id': 227}
+sync_beats 12
diff --git a/common/Resources/Desktops/desktop2 b/common/Resources/Desktops/desktop2
index b8395e1..e705e9f 100644
--- a/common/Resources/Desktops/desktop2
+++ b/common/Resources/Desktops/desktop2
@@ -396,3 +396,4 @@ block_add Instrument False 443 445 False {'volume': 0.5, 'reverb': 0, 'name': 'o
 block_add Loop False 550 445 True {'key': None, 'beats': 5, 'name': 'loop2', 'regularity': 0.80000000000000004, 'id': 82}
 block_add Loop False 638 445 True {'key': None, 'beats': 2, 'name': 'loop3', 'regularity': 0.80000000000000004, 'id': 81}
 block_add Drum False 233 354 False {'name': 'drum2kit', 'regularity': 0.32130953701001352, 'id': 134, 'volume': 0.5, 'beats': 9, 'key': None, 'reverb': 0.0, 'page': 78}
+sync_beats 3
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