Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/Config.py
diff options
context:
space:
mode:
authorjaberg <james@localhost.localdomain>2007-01-08 06:38:26 (GMT)
committer jaberg <james@localhost.localdomain>2007-01-08 06:38:26 (GMT)
commit17c2220bf0fcd29eb2d16fbc3a3b29b0b39103fc (patch)
tree236c2db1512cd42231da118629a06e0acdf1c6a6 /Config.py
parent2dc31155018d0a09b561a2dc8b9a24e3ed7ce047 (diff)
parent10621ebbb7a9a63bd738626df28f103f3ce17b3f (diff)
merged
Diffstat (limited to 'Config.py')
-rw-r--r--Config.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Config.py b/Config.py
index 1bbe9f0..e751262 100644
--- a/Config.py
+++ b/Config.py
@@ -32,9 +32,9 @@ class Instrument:
self.instrumentRegister = instrumentRegister
self.soundClass = soundClass
self.category = category
- self.loopStart = loopStart
- self.loopEnd = loopEnd
- self.crossDur = crossDur
+ self.loopStart = loopStart
+ self.loopEnd = loopEnd
+ self.crossDur = crossDur
# animals
OUNK = "ounk"
@@ -237,7 +237,7 @@ INSTRUMENTS = {
ZAP: Instrument( 61, INST_TIED, MID, 'melo', 'electronic', .299, .7323, .09895 ),
TRUMPET: Instrument( 62, INST_TIED, MID, 'melo', 'musicInst', .39934, .45537, .02729),
MARACAS: Instrument( 63, INST_SIMP, MID, "melo", 'musicInst', 0, 0, 0),
- MARIMBA: Instrument( 64, INST_TIED, MID, "melo", 'musicInst', .7096, .81391, .02425),
+ MARIMBA: Instrument( 64, INST_TIED, MID, "melo", 'musicInst', .26545, .33098, .03087),
TRIANGLE: Instrument( 65, INST_TIED, MID, "melo", 'musicInst', 1.21002, 1.31805, .01268),
LAUGH: Instrument( 66, INST_SIMP, MID, 'melo', 'people', 0, 0, 0 ),
VOIX: Instrument( 67, INST_TIED, MID, 'melo', 'people', .89608, .96092, .02343 ),
@@ -420,7 +420,7 @@ ModKeys = _ModKeys()
#DEFAULTS
DEFAULT_TEMPO = 120
-DEFAULT_VOLUME = 0.8
+DEFAULT_VOLUME = 80
#NUMERICAL CONSTANTS
NUMBER_OF_POSSIBLE_PITCHES = 25.0