From df75dd3b08c5ae87cc0c9d43870a5a73467eeb0f Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Fri, 19 Dec 2008 00:24:50 +0000
Subject: add kitStage member to Instrument class; refactor code to use .kit and .kitStage instead of .name parsing

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

diff --git a/TamTamJam.activity/Jam/Picker.py b/TamTamJam.activity/Jam/Picker.py
index f44c29f..aec2ae0 100644
--- a/TamTamJam.activity/Jam/Picker.py
+++ b/TamTamJam.activity/Jam/Picker.py
@@ -118,13 +118,30 @@ class Instrument( Picker ):
     def __init__( self, owner, filter =  ( "All" ) ):
         Picker.__init__( self, owner, filter )
 
-        self.csnd = new_csound_client()
         self.type = Instrument
 
         self.instrumentDB = InstrumentDB.getRef()
-        list = [inst for inst in self.instrumentDB.getSet( "All" ) if not inst.name.startswith('lab')]
 
-        for inst in list:
+        all = []
+        lab = []
+        mic = []
+        
+        for i in self.instrumentDB.getSet( "All" ):
+            if i.name.startswith('lab'):
+                lab.append(i)
+            elif i.name.startswith('mic'):
+                mic.append(i)
+            elif not i.kitStage and not i.kit:
+                all.append(i)
+
+        if not Config.XO:
+            lab.sort()
+            all += lab
+
+        mic.sort()
+        all += mic
+
+        for inst in all:
             self.addBlock( inst.instrumentId )
 
     def addBlock( self, id ):
@@ -132,8 +149,6 @@ class Instrument( Picker ):
         data = { "name": _(self.instrumentDB.instId[id].name),
                  "id":   id }
 
-        self.csnd.load_instrument(self.instrumentDB.instId[id].name)
-
         win = gtk.gdk.get_default_root_window()
         width = Block.Instrument.WIDTH
         height = Block.Instrument.HEIGHT
--
cgit v0.9.1