From 55e7449505a05638d88365101b7a8c92f3be8883 Mon Sep 17 00:00:00 2001 From: Nat Date: Fri, 21 Sep 2007 16:59:51 +0000 Subject: Removed categories in jam --- (limited to 'common/Config.py') diff --git a/common/Config.py b/common/Config.py index 62bd1f6..3d2987b 100644 --- a/common/Config.py +++ b/common/Config.py @@ -110,62 +110,62 @@ def _addInstrument( name, csoundInstrumentId, instrumentRegister, soundClass, ca _nextInstrumentId[0] += 1 -_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 ) -_addInstrument( "lab4", INST_SIMP, MID, 'melo', 'lab', 0, 0, 0 ) -_addInstrument( "lab5", INST_SIMP, MID, 'melo', 'lab', 0, 0, 0 ) -_addInstrument( "lab6", INST_SIMP, MID, 'melo', 'lab', 0, 0, 0 ) +_addInstrument( "mic1", INST_TIED, MID, 'melo', 'mysounds', .01, 1.99, .01 ) +_addInstrument( "mic2", INST_TIED, MID, 'melo', 'mysounds', .01, 1.99, .01 ) +_addInstrument( "mic3", INST_TIED, MID, 'melo', 'mysounds', .01, 1.99, .01 ) +_addInstrument( "mic4", INST_TIED, MID, 'melo', 'mysounds', .01, 1.99, .01 ) +_addInstrument( "lab1", INST_SIMP, MID, 'melo', 'mysounds', 0, 0, 0 ) +_addInstrument( "lab2", INST_SIMP, MID, 'melo', 'mysounds', 0, 0, 0 ) +_addInstrument( "lab3", INST_SIMP, MID, 'melo', 'mysounds', 0, 0, 0 ) +_addInstrument( "lab4", INST_SIMP, MID, 'melo', 'mysounds', 0, 0, 0 ) +_addInstrument( "lab5", INST_SIMP, MID, 'melo', 'mysounds', 0, 0, 0 ) +_addInstrument( "lab6", INST_SIMP, MID, 'melo', 'mysounds', 0, 0, 0 ) _addInstrument( "ounk", INST_SIMP, MID, 'melo', 'animals', 0, 0, 0 ) _addInstrument( "gam", INST_TIED, HIGH, 'melo', 'percussions', .69388, .7536, .02922 ) _addInstrument( "guit", INST_TIED, MID, 'melo', 'strings', .08592, .75126, .33571 ) _addInstrument( "koto", INST_TIED, HIGH, 'melo', 'strings', .56523, .70075, .05954 ) _addInstrument( "clarinette", INST_TIED, MID, 'melo', 'winds', .57905, .73319, .04934 ) _addInstrument( "flute", INST_TIED, MID, 'melo', 'winds', .47169, .53693, .02481 ) -_addInstrument( "drum1hatpedal", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1hatshoulder", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1hardride", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1ridebell", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1snare", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1snaresidestick", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1crash", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1splash", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1tom", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1floortom", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0) -_addInstrument( "drum1chine", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1kick", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) +_addInstrument( "drum1hatpedal", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1hatshoulder", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1hardride", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1ridebell", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1snare", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1snaresidestick", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1crash", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1splash", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1tom", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1floortom", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0) +_addInstrument( "drum1chine", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1kick", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) _addInstrument( "piano", INST_TIED, MID, 'melo', 'keyboard', 0.8883, 1.420524, .13575 ) _addInstrument( "dog", INST_SIMP, MID, 'melo', 'animals', 0, 0, 0 ) _addInstrument( "duck", INST_SIMP, MID, 'melo', 'animals', 0, 0, 0 ) -_addInstrument( "drum2darbukadoom", INST_SIMP, LOW, 'drum', 'drum', 0, 0 ,0 ) -_addInstrument( "drum2darbukapied", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2darbukapiedsoft", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2hatflanger", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2darbukatak", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2darbukafinger", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2darbukaroll", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2darbukaslap", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2hatpied", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2tambourinepied", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2hatpied2", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2tambourinepiedsoft", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3cowbell", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3cowbelltip", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0) -_addInstrument( "drum3cup", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3djembelow", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3djembemid", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3djembesidestick", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3djembeslap", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3djembestickmid", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3metalstand", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3pedalperc", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3rainstick", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3tambourinehigh", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3tambourinelow", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) +_addInstrument( "drum2darbukadoom", INST_SIMP, LOW, 'drum', 'percussions', 0, 0 ,0 ) +_addInstrument( "drum2darbukapied", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2darbukapiedsoft", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2hatflanger", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2darbukatak", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2darbukafinger", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2darbukaroll", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2darbukaslap", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2hatpied", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2tambourinepied", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2hatpied2", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2tambourinepiedsoft", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3cowbell", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3cowbelltip", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0) +_addInstrument( "drum3cup", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3djembelow", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3djembemid", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3djembesidestick", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3djembeslap", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3djembestickmid", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3metalstand", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3pedalperc", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3rainstick", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3tambourinehigh", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3tambourinelow", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) _addInstrument( "harmonica", INST_TIED, MID, 'melo', 'winds', .1531, .19188, .01792 ) _addInstrument( "alarm", INST_TIED, MID, 'melo', 'concret', .02, .19133, .01 ) _addInstrument( "bird", INST_TIED, MID, 'melo', 'animals', .1, 1, .05 ) @@ -211,31 +211,31 @@ _addInstrument( "guidice7", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "guidice8", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "guidice9", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "guidice10", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) -_addInstrument( "drum4afrofeet", INST_SIMP, LOW, 'drum', 'drum', 0, 0 ,0 ) -_addInstrument( "drum4fingersn", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4mutecuic", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4stompbass", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tambouri", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tr707clap", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tr707open", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tr808closed", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tr808sn", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tr909bass", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tr909kick", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tr909sn", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5timablesslap", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5congagraveouvert", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5timablesaiguslap", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5congagraveferme", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5guiroretour", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5vibraslap", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5congaaiguouvert", INST_SIMP, MID, 'drum', 'drum', 0, 0 ,0 ) -_addInstrument( "drum5quicamedium", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5quicaaigu", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5agogograve", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5bongoaiguouvert", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5agogoaigu", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5bongograveouvert", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) +_addInstrument( "drum4afrofeet", INST_SIMP, LOW, 'drum', 'percussions', 0, 0 ,0 ) +_addInstrument( "drum4fingersn", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4mutecuic", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4stompbass", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tambouri", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tr707clap", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tr707open", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tr808closed", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tr808sn", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tr909bass", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tr909kick", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tr909sn", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5timablesslap", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5congagraveouvert", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5timablesaiguslap", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5congagraveferme", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5guiroretour", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5vibraslap", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5congaaiguouvert", INST_SIMP, MID, 'drum', 'percussions', 0, 0 ,0 ) +_addInstrument( "drum5quicamedium", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5quicaaigu", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5agogograve", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5bongoaiguouvert", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5agogoaigu", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5bongograveouvert", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) _addInstrument( "camera", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "car", INST_TIED, MID, 'melo', 'concret', .67, 1.05761, .01 ) #_addInstrument( "cello", INST_TIED, MID, 'melo', 'strings', .194, .7211, .017 ) @@ -324,11 +324,11 @@ DRUM5KIT = { 24 : INSTRUMENTS["drum5timablesslap"], 46 : INSTRUMENTS["drum5agogograve"], 48 : INSTRUMENTS["drum5bongoaiguouvert"] } -_addInstrument( "drum1kit", 0, 0, 0, "kit", 0, 0, 0, DRUM1KIT ) -_addInstrument( "drum2kit", 0, 0, 0, "kit", 0, 0, 0, DRUM2KIT ) -_addInstrument( "drum3kit", 0, 0, 0, "kit", 0, 0, 0, DRUM3KIT ) -_addInstrument( "drum4kit", 0, 0, 0, "kit", 0, 0, 0, DRUM4KIT ) -_addInstrument( "drum5kit", 0, 0, 0, "kit", 0, 0, 0, DRUM5KIT ) +_addInstrument( "drum1kit", 0, 0, 0, "percussions", 0, 0, 0, DRUM1KIT ) +_addInstrument( "drum2kit", 0, 0, 0, "percussions", 0, 0, 0, DRUM2KIT ) +_addInstrument( "drum3kit", 0, 0, 0, "percussions", 0, 0, 0, DRUM3KIT ) +_addInstrument( "drum4kit", 0, 0, 0, "percussions", 0, 0, 0, DRUM4KIT ) +_addInstrument( "drum5kit", 0, 0, 0, "percussions", 0, 0, 0, DRUM5KIT ) INSTRUMENTSID = {} for i in INSTRUMENTS: -- cgit v0.9.1