Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TamTamSynthLab.activity/SynthLab
diff options
context:
space:
mode:
authorOli <olivier.belanger@umontreal.ca>2007-10-20 17:25:17 (GMT)
committer Oli <olivier.belanger@umontreal.ca>2007-10-20 17:25:17 (GMT)
commitcd62e6af4d8f4dda887f1aac15abb13128a7f447 (patch)
tree13fc523fa1f9d1555c7d235e3bf6c5a8bcfbaf25 /TamTamSynthLab.activity/SynthLab
parent138653b35fe9ed1ccc651fd988fac4b14e83f71a (diff)
removed csound table's load from startup
Diffstat (limited to 'TamTamSynthLab.activity/SynthLab')
-rwxr-xr-xTamTamSynthLab.activity/SynthLab/SynthLabConstants.py4
-rw-r--r--TamTamSynthLab.activity/SynthLab/SynthLabMain.py25
2 files changed, 14 insertions, 15 deletions
diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py b/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py
index 77ead26..0fcda29 100755
--- a/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py
+++ b/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py
@@ -73,18 +73,14 @@ class SynthLabConstants:
'chorus': [.5, 1., 5., .5, 0, 3, 0, 10, 0, 30, 0, 1, FLOAT, FLOAT, FLOAT]}
CONTROL_TYPES = ['lfo', 'rand', 'adsr', 'trackpadX', 'trackpadY']
- #CONTROL_TYPES_SEL = [type + 'sel' for type in CONTROL_TYPES]
CONTROL_TYPES_PLUS = [type + '+' for type in CONTROL_TYPES]
SOURCE_TYPES = ['fm', 'buzz', 'vco', 'pluck', 'noise', 'sample', 'voice', 'grain', 'addSynth', 'mic']
- #SOURCE_TYPES_SEL = [type + 'sel' for type in SOURCE_TYPES]
SOURCE_TYPES_PLUS = [type + '+' for type in SOURCE_TYPES]
FX_TYPES = ['wguide', 'distort','filter', 'ring', 'reverb', 'harmon', 'eq4band', 'chorus']
- #FX_TYPES_SEL = [type + 'sel' for type in FX_TYPES]
FX_TYPES_PLUS = [type + '+' for type in FX_TYPES]
OUTPUT_TYPE = ['adsr']
OUTPUT_TYPE_SEL = ['adsrsel']
CHOOSE_TYPE = [CONTROL_TYPES, SOURCE_TYPES, FX_TYPES, OUTPUT_TYPE]
- #CHOOSE_TYPE2 = [CONTROL_TYPES_SEL, SOURCE_TYPES_SEL, FX_TYPES_SEL, OUTPUT_TYPE_SEL]
CHOOSE_TYPE_PLUS = [CONTROL_TYPES_PLUS, SOURCE_TYPES_PLUS, FX_TYPES_PLUS]
# SynthLab Tooltips
diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
index 4aeb60a..b6476d5 100644
--- a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
+++ b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
@@ -1146,6 +1146,19 @@ class SynthLabMain(gtk.EventBox):
mess = "f5504 0 32768 -1 " + "\"%s\" 0 0 0" % snd
self.csnd.inputMessage( mess )
time.sleep(.005)
+ if lastTable[4] == 6:
+ snd = self.sample_names[int(sourceParametersTable[1])]
+ self.csnd.load_instrument(snd)
+ if lastTable[5] == 6:
+ snd = self.sample_names[int(sourceParametersTable[5])]
+ self.csnd.load_instrument(snd)
+ if lastTable[6] == 6:
+ snd = self.sample_names[int(sourceParametersTable[9])]
+ self.csnd.load_instrument(snd)
+ if lastTable[7] == 6:
+ snd = self.sample_names[int(sourceParametersTable[13])]
+ self.csnd.load_instrument(snd)
+ time.sleep(.005)
def recordSound( self, widget, data ):
if widget.get_active() == True:
@@ -1418,14 +1431,4 @@ class SynthLabMain(gtk.EventBox):
f = shelve.open( Config.TAM_TAM_ROOT + '/common/Resources/SynthFiles/' + preset, 'r')
self.loadState(f)
f.close()
- self.handleSaveTemp()
-
- def initRadioButton( self, labelList, methodCallback, box ):
- for i in range( len( labelList ) ):
- label = labelList[i]
- if i == 0:
- button = ImageRadioButton( group = None, mainImg_path = Config.IMAGE_ROOT + label + '.png', altImg_path = Config.IMAGE_ROOT + label + 'sel.png' )
- else:
- button = ImageRadioButton( group = button, mainImg_path = Config.IMAGE_ROOT + label + '.png', altImg_path = Config.IMAGE_ROOT + label + 'sel.png' )
- button.connect( "toggled", methodCallback, i )
- box.pack_start( button, True, True )
+ self.handleSaveTemp() \ No newline at end of file