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 'TamTamJam.activity/Jam/Desktop.py')

diff --git a/TamTamJam.activity/Jam/Desktop.py b/TamTamJam.activity/Jam/Desktop.py
index 1f5e5eb..67dc70b 100644
--- a/TamTamJam.activity/Jam/Desktop.py
+++ b/TamTamJam.activity/Jam/Desktop.py
@@ -34,7 +34,6 @@ class Desktop( gtk.EventBox ):
 
         self.blocks = [] # items on the desktop
         self.activeInstrument = None
-        self.activeDrum = None
 
         self.loops = {} # dict of playing loops by loop root 
         self.drums = [] # list of active drums
@@ -128,11 +127,12 @@ class Desktop( gtk.EventBox ):
                         break
 
         elif block.type == Block.Drum:
-            if block == self.activeDrum:
-                self.deactivateDrum()
+            if block.isActive():
+                self.deactivateDrum( block )
 
         elif block.type == Block.Loop:
-            pass
+            if block.isActive():
+                self.deactivateLoop( block )
 
         if block in self.blocks:
             block.invalidate_rect( True )
--
cgit v0.9.1