From 3b5401d301fa1b3ad71a84160fa1ce031e00dfb1 Mon Sep 17 00:00:00 2001
From: amartin <olpc@xo-05-28-21.localdomain>
Date: Sat, 03 Nov 2007 05:40:00 +0000
Subject: Merge branch 'master' of git+ssh://amartin@dev.laptop.org/git/projects/tamtam

---
(limited to 'TamTamJam.activity/Jam')

diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py
index 3f5542f..48afaf2 100644
--- a/TamTamJam.activity/Jam/JamMain.py
+++ b/TamTamJam.activity/Jam/JamMain.py
@@ -373,7 +373,7 @@ class JamMain(gtk.EventBox):
                                          self.instrument["amplitude"]*0.5, # trackVol*noteVol
                                          self.instrument["pan"],
                                          100,
-                                         inst.kit[pitch].instrumentId,
+                                         self.instrumentDB.instNamed[inst.kit[pitch]].instrumentId,
                                          self.instrument["reverb"] )
             else:
                 if event.state == gtk.gdk.MOD1_MASK:
--
cgit v0.9.1