From 35104f6074a2bd9465c100618116658698d37be8 Mon Sep 17 00:00:00 2001
From: Nat <natcl@hotmail.com>
Date: Fri, 20 Jul 2007 16:38:11 +0000
Subject: Merge branch 'master' of git+ssh://natcl@dev.laptop.org/git/projects/tamtam

---
(limited to 'Config.py')

diff --git a/Config.py b/Config.py
index b9fcaa4..6586080 100644
--- a/Config.py
+++ b/Config.py
@@ -33,10 +33,12 @@ if SugarMode == True:
     PREF_DIR = env.get_profile_path() + '/tamtam'
     TUNE_DIR=env.get_profile_path() + '/tamtam/tunes'
     SYNTH_DIR=env.get_profile_path() + '/tamtam/synthlab'
+    SNDS_DIR=env.get_profile_path() + '/tamtam/snds'
 else:
     PREF_DIR = SOUNDS_DIR + '/temp'
     TUNE_DIR= os.getenv('HOME') + '/.tamtam/tunes'
     SYNTH_DIR= os.getenv('HOME') + '/.tamtam/synthlab'
+    SNDS_DIR= os.getenv('HOME') + '/.tamtam/snds'
 
 
 #PLUGIN
@@ -99,10 +101,10 @@ def _addInstrument( name, csoundInstrumentId, instrumentRegister, soundClass, ca
         INSTRUMENTS[name] = Instrument( name, _nextInstrumentId[0], csoundInstrumentId, instrumentRegister, soundClass, category, loopStart, loopEnd, crossDur, kit )
         _nextInstrumentId[0] += 1
 
-_addInstrument( "mic1", INST_TIED, MID, 'melo', 'mic', .01, .99, .01 )
-_addInstrument( "mic2", INST_TIED, MID, 'melo', 'mic', .01, .99, .01 )
-_addInstrument( "mic3", INST_TIED, MID, 'melo', 'mic', .01, .99, .01 )
-_addInstrument( "mic4", INST_TIED, MID, 'melo', 'mic', .01, .99, .01 )
+_addInstrument( "mic1", INST_TIED, MID, 'melo', 'mic', .01, 1.99, .01 )
+_addInstrument( "mic2", INST_TIED, MID, 'melo', 'mic', .01, 1.99, .01 )
+_addInstrument( "mic3", INST_TIED, MID, 'melo', 'mic', .01, 1.99, .01 )
+_addInstrument( "mic4", INST_TIED, MID, 'melo', 'mic', .01, 1.99, .01 )
 _addInstrument( "lab1", INST_SIMP, MID, 'melo', 'lab', 0, 0, 0 )
 _addInstrument( "lab2", INST_SIMP, MID, 'melo', 'lab', 0, 0, 0 )
 _addInstrument( "lab3", INST_SIMP, MID, 'melo', 'lab', 0, 0, 0 )
@@ -344,7 +346,7 @@ PLAY_NOTE_COMMAND_MINUS_DELAY = \
         "perf.InputMessage('i 5777 0.0 0.001 %d.%d %s %f %f %f %f %f %d %f %f %d %f')\n"
 PLAY_NOTE_OFF_COMMAND =  \
         "perf.InputMessage('i %s.%s .2 0.01 1. 0. 0. 0.5 %d 0 0 0 0')\n" \
-        % ('%d', '%d', INSTRUMENT_TABLE_OFFSET )        
+        % ('%d', '%d', INSTRUMENT_TABLE_OFFSET )
 MIC_RECORDING_COMMAND = \
         "perf.InputMessage('i5201 0 5 %d')\n"
 UNLOAD_TABLES_COMMAND = \
--
cgit v0.9.1