From bda2ab115da1b3efbd0a772460d31633658f68a8 Mon Sep 17 00:00:00 2001
From: amartin <olpc@xo-05-28-21.localdomain>
Date: Sat, 22 Sep 2007 08:34:30 +0000
Subject: Jam keyboard recording

---
(limited to 'common/Util')

diff --git a/common/Util/Block.py b/common/Util/Block.py
index 6208add..9b1abea 100644
--- a/common/Util/Block.py
+++ b/common/Util/Block.py
@@ -422,8 +422,8 @@ class Drum(Block):
             self.owner.updateDrum( self )
 
     def substitute( self, block ):
-        self.data["name"] = block.data["name"]
-        self.data["id"] = block.data["id"]
+        self.setData( "name", block.data["name"] )
+        self.setData( "id", block.data["id"] )
 
         self.img = [ self.owner.getInstrumentImage( self.data["id"], False ),
                      self.owner.getInstrumentImage( self.data["id"], True ) ]
@@ -431,7 +431,7 @@ class Drum(Block):
         self.invalidate_rect( True )
 
         if self.active:
-            self.owner.updateDrum()
+            self.owner.updateDrum( self )
 
     def testSubstitute( self, block ):
         ret = Block.testSubstitute( self, block )
@@ -603,10 +603,10 @@ class Loop(Block):
     def setData( self, key, value ):
 
         if key == "beats":
+            self.data["beats"] = value
             self.owner.noteDB.updatePage( self.data["id"], PARAMETER.PAGE_BEATS, value )
             self._updateWidth()
             self.updateLoop()
-            self.data["beats"] = value
 
         elif key == "key":
             oldKey = self.data["key"]
--
cgit v0.9.1