Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@member.fsf.org>2008-12-19 21:00:13 (GMT)
committer Aleksey Lim <alsroot@member.fsf.org>2008-12-19 23:50:58 (GMT)
commit757076c22902ccce95717e8d4fcc38e158d2f079 (patch)
tree7343f40190e8a62d2af31802905ad611c640074a
parent1e4c788150ed45dfb9a63448d7edb3b8113aaa5b (diff)
add FEATURES_* tags to Config.py
-rw-r--r--TamTamEdit.activity/Edit/EditToolbars.py13
-rw-r--r--TamTamEdit.activity/Edit/MainWindow.py2
-rw-r--r--TamTamJam.activity/Jam/JamMain.py2
-rw-r--r--TamTamJam.activity/Jam/Toolbars.py58
-rwxr-xr-xTamTamSynthLab.activity/SynthLab/SynthLabConstants.py2
-rw-r--r--TamTamSynthLab.activity/SynthLab/SynthLabToolbars.py86
-rw-r--r--common/Config.py17
-rw-r--r--common/Util/Instruments.py17
8 files changed, 101 insertions, 96 deletions
diff --git a/TamTamEdit.activity/Edit/EditToolbars.py b/TamTamEdit.activity/Edit/EditToolbars.py
index ecde886..27ad17c 100644
--- a/TamTamEdit.activity/Edit/EditToolbars.py
+++ b/TamTamEdit.activity/Edit/EditToolbars.py
@@ -75,12 +75,13 @@ class mainToolbar(gtk.Toolbar):
self.recordButton.show()
self.recordButton.set_tooltip(_('Record keyboard'))
- #RecordOgg button
- self.recordOggButton = ToggleToolButton('recordO')
- self.recordOggButton.connect('clicked', self.edit.handleAudioRecord)
- self.insert(self.recordOggButton, -1)
- self.recordOggButton.show()
- self.recordOggButton.set_tooltip(_('Record to ogg'))
+ if Config.FEATURES_OGG:
+ #RecordOgg button
+ self.recordOggButton = ToggleToolButton('recordO')
+ self.recordOggButton.connect('clicked', self.edit.handleAudioRecord)
+ self.insert(self.recordOggButton, -1)
+ self.recordOggButton.show()
+ self.recordOggButton.set_tooltip(_('Record to ogg'))
_insertSeparator(1)
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py
index 71ca674..dc698c0 100644
--- a/TamTamEdit.activity/Edit/MainWindow.py
+++ b/TamTamEdit.activity/Edit/MainWindow.py
@@ -2132,8 +2132,6 @@ class instrumentPalette( Popup ):
self.volumeSlider.set_draw_value(False)
self.categories = Config.CATEGORIES
- if Config.XO: self.categories.remove('mysounds')
-
self.categoryBox = BigComboBox()
for category in self.categories:
image = Config.IMAGE_ROOT + category.lower() + '.png'
diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py
index ae41951..f58c416 100644
--- a/TamTamJam.activity/Jam/JamMain.py
+++ b/TamTamJam.activity/Jam/JamMain.py
@@ -205,7 +205,7 @@ class JamMain(gtk.EventBox):
self.activity.toolbox.add_toolbar( _("Playback"), self.playbackToolbar )
self.desktopToolbar = DesktopToolbar( self )
self.activity.toolbox.add_toolbar( _("Desktop"), self.desktopToolbar )
- if Config.MIC:
+ if Config.FEATURES_MIC or Config.FEATURES_NEWSOUNDS:
self.recordToolbar = RecordToolbar( self )
self.activity.toolbox.add_toolbar( _("Record"), self.recordToolbar )
diff --git a/TamTamJam.activity/Jam/Toolbars.py b/TamTamJam.activity/Jam/Toolbars.py
index 354ec15..624a72c 100644
--- a/TamTamJam.activity/Jam/Toolbars.py
+++ b/TamTamJam.activity/Jam/Toolbars.py
@@ -313,37 +313,39 @@ class RecordToolbar(gtk.Toolbar):
#self.toolbox = toolbox
self.jam = jam
- self.micRec1Button = ToolButton('rec1')
- self.micRec1Button.connect('clicked',self.jam.micRec,'mic1')
- self.insert(self.micRec1Button, -1)
- self.micRec1Button.show()
- self.micRec1Button.set_tooltip(_('Record microphone into slot 1'))
-
- self.micRec2Button = ToolButton('rec2')
- self.micRec2Button.connect('clicked',self.jam.micRec,'mic2')
- self.insert(self.micRec2Button, -1)
- self.micRec2Button.show()
- self.micRec2Button.set_tooltip(_('Record microphone into slot 2'))
-
- self.micRec3Button = ToolButton('rec3')
- self.micRec3Button.connect('clicked',self.jam.micRec,'mic3')
- self.insert(self.micRec3Button, -1)
- self.micRec3Button.show()
- self.micRec3Button.set_tooltip(_('Record microphone into slot 3'))
-
- self.micRec4Button = ToolButton('rec4')
- self.micRec4Button.connect('clicked',self.jam.micRec,'mic4')
- self.insert(self.micRec4Button, -1)
- self.micRec4Button.show()
- self.micRec4Button.set_tooltip(('Record microphone into slot 4'))
+ if Config.FEATURES_MIC:
+ self.micRec1Button = ToolButton('rec1')
+ self.micRec1Button.connect('clicked',self.jam.micRec,'mic1')
+ self.insert(self.micRec1Button, -1)
+ self.micRec1Button.show()
+ self.micRec1Button.set_tooltip(_('Record microphone into slot 1'))
+
+ self.micRec2Button = ToolButton('rec2')
+ self.micRec2Button.connect('clicked',self.jam.micRec,'mic2')
+ self.insert(self.micRec2Button, -1)
+ self.micRec2Button.show()
+ self.micRec2Button.set_tooltip(_('Record microphone into slot 2'))
+
+ self.micRec3Button = ToolButton('rec3')
+ self.micRec3Button.connect('clicked',self.jam.micRec,'mic3')
+ self.insert(self.micRec3Button, -1)
+ self.micRec3Button.show()
+ self.micRec3Button.set_tooltip(_('Record microphone into slot 3'))
+
+ self.micRec4Button = ToolButton('rec4')
+ self.micRec4Button.connect('clicked',self.jam.micRec,'mic4')
+ self.insert(self.micRec4Button, -1)
+ self.micRec4Button.show()
+ self.micRec4Button.set_tooltip(('Record microphone into slot 4'))
_insertSeparator()
- self._loopSettingsPalette = LoopSettingsPalette(_('Add new Sound'), self.jam)
- self.loopSetButton = ToggleToolButton('loop')
- self.loopSetButton.set_palette(self._loopSettingsPalette)
- self.insert(self.loopSetButton, -1)
- self.loopSetButton.show()
+ if Config.FEATURES_NEWSOUNDS:
+ self._loopSettingsPalette = LoopSettingsPalette(_('Add new Sound'), self.jam)
+ self.loopSetButton = ToggleToolButton('loop')
+ self.loopSetButton.set_palette(self._loopSettingsPalette)
+ self.insert(self.loopSetButton, -1)
+ self.loopSetButton.show()
self.show_all()
diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py b/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py
index 0fd9094..0d90569 100755
--- a/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py
+++ b/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py
@@ -76,7 +76,7 @@ class SynthLabConstants:
CONTROL_TYPES = ['lfo', 'rand', 'adsr', 'trackpadX', 'trackpadY']
CONTROL_TYPES_PLUS = [type + '+' for type in CONTROL_TYPES]
SOURCE_TYPES = ['fm', 'buzz', 'vco', 'pluck', 'noise', 'sample', 'voice', 'grain', 'addSynth']
- if Config.MIC: SOURCE_TYPES += ['mic']
+ if Config.FEATURES_MIC: SOURCE_TYPES += ['mic']
SOURCE_TYPES_PLUS = [type + '+' for type in SOURCE_TYPES]
FX_TYPES = ['wguide', 'distort','filter', 'ring', 'reverb', 'harmon', 'eq4band', 'chorus']
FX_TYPES_PLUS = [type + '+' for type in FX_TYPES]
diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabToolbars.py b/TamTamSynthLab.activity/SynthLab/SynthLabToolbars.py
index c55fc34..14e4e90 100644
--- a/TamTamSynthLab.activity/SynthLab/SynthLabToolbars.py
+++ b/TamTamSynthLab.activity/SynthLab/SynthLabToolbars.py
@@ -51,48 +51,50 @@ class mainToolbar(gtk.Toolbar):
_insertSeparator(1)
- self.synthRec1Button = ToggleToolButton('rec1')
- self.synthRec1Button.connect('clicked',self.synthLab.recordSound,1)
- self.insert(self.synthRec1Button, -1)
- self.synthRec1Button.show()
- self.synthRec1Button.set_tooltip(_('Record Synth sound into slot "lab1"'))
-
- self.synthRec2Button = ToggleToolButton('rec2')
- self.synthRec2Button.connect('clicked',self.synthLab.recordSound,2)
- self.insert(self.synthRec2Button, -1)
- self.synthRec2Button.show()
- self.synthRec2Button.set_tooltip(_('Record Synth sound into slot "lab2"'))
-
- self.synthRec3Button = ToggleToolButton('rec3')
- self.synthRec3Button.connect('clicked',self.synthLab.recordSound,3)
- self.insert(self.synthRec3Button, -1)
- self.synthRec3Button.show()
- self.synthRec3Button.set_tooltip(_('Record Synth sound into slot "lab3"'))
-
- self.synthRec4Button = ToggleToolButton('rec4')
- self.synthRec4Button.connect('clicked',self.synthLab.recordSound,4)
- self.insert(self.synthRec4Button, -1)
- self.synthRec4Button.show()
- self.synthRec4Button.set_tooltip(_('Record Synth sound into slot "lab4"'))
-
- self.synthRec5Button = ToggleToolButton('rec5')
- self.synthRec5Button.connect('clicked',self.synthLab.recordSound,5)
- self.insert(self.synthRec5Button, -1)
- self.synthRec5Button.show()
- self.synthRec5Button.set_tooltip(_('Record Synth sound into slot "lab5"'))
-
- self.synthRec6Button = ToggleToolButton('rec6')
- self.synthRec6Button.connect('clicked',self.synthLab.recordSound,6)
- self.insert(self.synthRec6Button, -1)
- self.synthRec6Button.show()
- self.synthRec6Button.set_tooltip(_('Record Synth sound into slot "lab6"'))
-
- #RecordOgg button
- self.recordOggButton = ToggleToolButton('recordO')
- self.recordOggButton.connect('clicked', self.synthLab.recordOgg)
- self.insert(self.recordOggButton, -1)
- self.recordOggButton.show()
- self.recordOggButton.set_tooltip(_('Record to ogg'))
+ if Config.FEATURES_LAB:
+ self.synthRec1Button = ToggleToolButton('rec1')
+ self.synthRec1Button.connect('clicked',self.synthLab.recordSound,1)
+ self.insert(self.synthRec1Button, -1)
+ self.synthRec1Button.show()
+ self.synthRec1Button.set_tooltip(_('Record Synth sound into slot "lab1"'))
+
+ self.synthRec2Button = ToggleToolButton('rec2')
+ self.synthRec2Button.connect('clicked',self.synthLab.recordSound,2)
+ self.insert(self.synthRec2Button, -1)
+ self.synthRec2Button.show()
+ self.synthRec2Button.set_tooltip(_('Record Synth sound into slot "lab2"'))
+
+ self.synthRec3Button = ToggleToolButton('rec3')
+ self.synthRec3Button.connect('clicked',self.synthLab.recordSound,3)
+ self.insert(self.synthRec3Button, -1)
+ self.synthRec3Button.show()
+ self.synthRec3Button.set_tooltip(_('Record Synth sound into slot "lab3"'))
+
+ self.synthRec4Button = ToggleToolButton('rec4')
+ self.synthRec4Button.connect('clicked',self.synthLab.recordSound,4)
+ self.insert(self.synthRec4Button, -1)
+ self.synthRec4Button.show()
+ self.synthRec4Button.set_tooltip(_('Record Synth sound into slot "lab4"'))
+
+ self.synthRec5Button = ToggleToolButton('rec5')
+ self.synthRec5Button.connect('clicked',self.synthLab.recordSound,5)
+ self.insert(self.synthRec5Button, -1)
+ self.synthRec5Button.show()
+ self.synthRec5Button.set_tooltip(_('Record Synth sound into slot "lab5"'))
+
+ self.synthRec6Button = ToggleToolButton('rec6')
+ self.synthRec6Button.connect('clicked',self.synthLab.recordSound,6)
+ self.insert(self.synthRec6Button, -1)
+ self.synthRec6Button.show()
+ self.synthRec6Button.set_tooltip(_('Record Synth sound into slot "lab6"'))
+
+ if Config.FEATURES_OGG:
+ #RecordOgg button
+ self.recordOggButton = ToggleToolButton('recordO')
+ self.recordOggButton.connect('clicked', self.synthLab.recordOgg)
+ self.insert(self.recordOggButton, -1)
+ self.recordOggButton.show()
+ self.recordOggButton.set_tooltip(_('Record to ogg'))
_insertSeparator(1)
diff --git a/common/Config.py b/common/Config.py
index fee725c..4fdb2dd 100644
--- a/common/Config.py
+++ b/common/Config.py
@@ -6,10 +6,10 @@ import logging
#QUICKLOAD = os.path.isfile("QUICKLOAD") # skip loading inessential comenents to speed things up
-if os.path.exists('/ofw'):
- XO = True
-else:
- XO = None
+FEATURES_OGG = True
+FEATURES_MIC = None
+FEATURES_LAB = None
+FEATURES_NEWSOUNDS = None
if os.path.isfile("DEBUG"):
f = open("DEBUG")
@@ -30,7 +30,7 @@ TMP_DIR = os.path.join(get_activity_root(), 'tmp')
logging.debug('INFO: loaded TAMTAM_ROOT=%s' % TAM_TAM_ROOT)
-if XO:
+if os.path.exists('/ofw'): # XO
DATA_DIR = os.path.join(get_activity_root(), 'data')
SNDS_INFO_DIR = os.path.join(get_activity_root(), 'data', 'snds_info')
FILES_DIR = os.path.join(TAM_TAM_ROOT, "..", "TamTamEdit.activity", "common", "Resources")
@@ -62,8 +62,6 @@ PLUGIN_NPERIODS = 2
## SOUNDS
##############
-MIC = False
-
ARECORD = "arecord " + os.getenv("TAMTAM_ARECORD",
"-f S16_LE -t wav -r 16000 -c2 -D hw:0,0")
@@ -75,7 +73,10 @@ INST_TIED = 5001
INST_SIMP = 5011
INST_PERC = 5021
-CATEGORIES = ['all','animals','concret','keyboard','people','percussions','strings','winds', 'mysounds']
+CATEGORIES = ['all','animals','concret','keyboard','people','percussions','strings','winds']
+
+if FEATURES_MIC or FEATURES_LAB:
+ CATEGORIES.append('mysounds')
#CSOUND COMMANDS
CSOUND_LOAD_INSTRUMENT = 'f%d 0 0 -1 "%s" 0 0 0'
diff --git a/common/Util/Instruments.py b/common/Util/Instruments.py
index 970d15c..4f5b987 100644
--- a/common/Util/Instruments.py
+++ b/common/Util/Instruments.py
@@ -20,13 +20,13 @@ instrumentDB = InstrumentDB.getRef()
def _addInstrument( name, csoundInstrumentId, instrumentRegister, category, loopStart, loopEnd, crossDur, ampScale = 1, kit = None, kitStage = False, volatile = False ):
instrumentDB.addInstrumentFromArgs( name, csoundInstrumentId, instrumentRegister, loopStart, loopEnd, crossDur, ampScale, kit, name, Config.IMAGE_ROOT+"/"+name+".png", category, kitStage = kitStage, volatile = volatile )
-if Config.MIC:
+if Config.FEATURES_MIC:
_addInstrument( "mic1", INST_TIED, MID, 'mysounds', .01, 1.99, .01, 1, volatile = True )
_addInstrument( "mic2", INST_TIED, MID, 'mysounds', .01, 1.99, .01, 1, volatile = True )
_addInstrument( "mic3", INST_TIED, MID, 'mysounds', .01, 1.99, .01, 1, volatile = True )
_addInstrument( "mic4", INST_TIED, MID, 'mysounds', .01, 1.99, .01, 1, volatile = True )
-if not Config.XO:
+if Config.FEATURES_LAB:
_addInstrument( "lab1", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile = True )
_addInstrument( "lab2", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile = True )
_addInstrument( "lab3", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1, volatile = True )
@@ -179,12 +179,13 @@ _addInstrument( "guit2", INST_TIED, MID, 'strings', 1.186341406, 1.929568266, .2
_addInstrument( "plane", INST_SIMP, MID, 'concret', 0, 0, 0, 0.6 )
_addInstrument( "slap", INST_SIMP, MID, 'concret', 0, 0, 0, 0.7 )
-try:
- files = os.listdir(Config.SNDS_INFO_DIR)
- for file in files:
- instrumentDB.addInstrument(Config.SNDS_INFO_DIR + '/' + file)
-except:
- pass
+if Config.FEATURES_NEWSOUNDS:
+ try:
+ files = os.listdir(Config.SNDS_INFO_DIR)
+ for file in files:
+ instrumentDB.addInstrument(Config.SNDS_INFO_DIR + '/' + file)
+ except:
+ pass
#jamId = os.path.split(os.path.realpath("/home/olpc/isolation/1/bundle_id_to_gid/org.laptop.TamTamJam"))[1]