Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TamTamJam.activity/Jam
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@member.fsf.org>2008-12-19 04:26:58 (GMT)
committer Aleksey Lim <alsroot@member.fsf.org>2008-12-19 23:50:57 (GMT)
commitcf9c4c752d2b2941d3598cde31c437225696f012 (patch)
tree40196f96d9d9f7576d5e95ab7cbbdcf3a11ea46e /TamTamJam.activity/Jam
parent11ddb4cbf9b695fdd042105d7e341f20e347e018 (diff)
global on/off mic&lab from Config flags
Diffstat (limited to 'TamTamJam.activity/Jam')
-rw-r--r--TamTamJam.activity/Jam/JamMain.py5
-rw-r--r--TamTamJam.activity/Jam/Picker.py6
2 files changed, 5 insertions, 6 deletions
diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py
index d78b095..ae41951 100644
--- a/TamTamJam.activity/Jam/JamMain.py
+++ b/TamTamJam.activity/Jam/JamMain.py
@@ -205,8 +205,9 @@ class JamMain(gtk.EventBox):
self.activity.toolbox.add_toolbar( _("Playback"), self.playbackToolbar )
self.desktopToolbar = DesktopToolbar( self )
self.activity.toolbox.add_toolbar( _("Desktop"), self.desktopToolbar )
- self.recordToolbar = RecordToolbar( self )
- self.activity.toolbox.add_toolbar( _("Record"), self.recordToolbar )
+ if Config.MIC:
+ self.recordToolbar = RecordToolbar( self )
+ self.activity.toolbox.add_toolbar( _("Record"), self.recordToolbar )
#-- GUI -----------------------------------------------
if True: # GUI
diff --git a/TamTamJam.activity/Jam/Picker.py b/TamTamJam.activity/Jam/Picker.py
index aec2ae0..70d4481 100644
--- a/TamTamJam.activity/Jam/Picker.py
+++ b/TamTamJam.activity/Jam/Picker.py
@@ -134,11 +134,9 @@ class Instrument( Picker ):
elif not i.kitStage and not i.kit:
all.append(i)
- if not Config.XO:
- lab.sort()
- all += lab
-
+ lab.sort()
mic.sort()
+ all += lab
all += mic
for inst in all: