new sounds (not scaled in amplitude), removed specific Config from MiniTamTam

26 files changed, 34 insertions, 33 deletions

diff --git a/TamTamMini.activity/MANIFEST b/TamTamMini.activity/MANIFEST
index 67d6985..b6de0fb 100644
--- a/TamTamMini.activity/MANIFEST
+++ b/TamTamMini.activity/MANIFEST
@@ -1,7 +1,6 @@
 MANIFEST
 NEWS
 setup.py
-Config.py
 TamTamMini.py
 activity/activity-tamtammini.svg
 activity/activity.info
diff --git a/TamTamMini.activity/Mini/Fillin.py b/TamTamMini.activity/Mini/Fillin.py
index 8dfc23f..162f8ef 100644
--- a/TamTamMini.activity/Mini/Fillin.py
+++ b/TamTamMini.activity/Mini/Fillin.py
@@ -6,7 +6,7 @@ import gobject
 from RythmGenerator import *
 from common.Util.CSoundClient import new_csound_client
 from common.Util.NoteDB import Note
-import Config
+import common.Config as Config
 
 class Fillin:
     def __init__( self, nbeats, tempo, instrument, reverb, volume ):
diff --git a/TamTamMini.activity/Mini/GenRythm.py b/TamTamMini.activity/Mini/GenRythm.py
index 1132991..330e174 100644
--- a/TamTamMini.activity/Mini/GenRythm.py
+++ b/TamTamMini.activity/Mini/GenRythm.py
@@ -1,5 +1,5 @@
 import random
-import Config
+import common.Config as Config
 
 from common.Generation.GenerationConstants import GenerationConstants
 from common.Generation.Utils import *
diff --git a/TamTamMini.activity/Mini/InstrumentPanel.py b/TamTamMini.activity/Mini/InstrumentPanel.py
index 3d93647..8cac210 100644
--- a/TamTamMini.activity/Mini/InstrumentPanel.py
+++ b/TamTamMini.activity/Mini/InstrumentPanel.py
@@ -6,7 +6,7 @@ import gtk
 
 import time
 
-import Config
+import common.Config as Config
 from common.Util.ThemeWidgets import *
 Tooltips = Config.Tooltips
 
diff --git a/TamTamMini.activity/Mini/KeyboardStandAlone.py b/TamTamMini.activity/Mini/KeyboardStandAlone.py
index 436c185..e3c3424 100644
--- a/TamTamMini.activity/Mini/KeyboardStandAlone.py
+++ b/TamTamMini.activity/Mini/KeyboardStandAlone.py
@@ -2,7 +2,7 @@ import pygtk
 pygtk.require( '2.0' )
 import gtk
 
-import Config
+import common.Config as Config
 from common.Generation.GenerationConstants import GenerationConstants
 from common.Util.NoteDB  import Note
 from common.Util.CSoundNote import CSoundNote
diff --git a/TamTamMini.activity/Mini/Loop.py b/TamTamMini.activity/Mini/Loop.py
index 49169eb..4f58912 100755
--- a/TamTamMini.activity/Mini/Loop.py
+++ b/TamTamMini.activity/Mini/Loop.py
@@ -1,4 +1,4 @@
-import Config
+import common.Config as Config
 import random
 import lps
 from  common.Generation.Drunk import *
diff --git a/TamTamMini.activity/Mini/MiniSequencer.py b/TamTamMini.activity/Mini/MiniSequencer.py
index 639b684..991ee13 100644
--- a/TamTamMini.activity/Mini/MiniSequencer.py
+++ b/TamTamMini.activity/Mini/MiniSequencer.py
@@ -3,7 +3,7 @@ pygtk.require( '2.0' )
 import gtk
 import gobject
 import time
-import Config
+import common.Config as Config
 from common.Util.CSoundNote import CSoundNote
 from common.Util.CSoundClient import new_csound_client
 from common.Util.NoteDB import Note
diff --git a/TamTamMini.activity/Mini/NoteStdAlone.py b/TamTamMini.activity/Mini/NoteStdAlone.py
index a331719..0dd4638 100644
--- a/TamTamMini.activity/Mini/NoteStdAlone.py
+++ b/TamTamMini.activity/Mini/NoteStdAlone.py
@@ -1,4 +1,4 @@
-import Config
+import common.Config as Config
 from common.Util.CSoundClient import CSoundClient
 from common.Generation.GenerationConstants import GenerationConstants
 
diff --git a/TamTamMini.activity/Mini/RythmGenerator.py b/TamTamMini.activity/Mini/RythmGenerator.py
index 3231eb8..537f598 100644
--- a/TamTamMini.activity/Mini/RythmGenerator.py
+++ b/TamTamMini.activity/Mini/RythmGenerator.py
@@ -1,6 +1,6 @@
 import random
 
-import Config
+import common.Config as Config
 from common.Util.CSoundNote import CSoundNote
 from common.Generation.GenerationConstants import GenerationConstants
 from GenRythm import GenRythm
diff --git a/TamTamMini.activity/Mini/miniTamTamMain.py b/TamTamMini.activity/Mini/miniTamTamMain.py
index eb73577..1f9048e 100644
--- a/TamTamMini.activity/Mini/miniTamTamMain.py
+++ b/TamTamMini.activity/Mini/miniTamTamMain.py
@@ -14,7 +14,7 @@ from common.Util.NoteDB import PARAMETER
 
 import common.Util.Network as Net
 
-import Config
+import common.Config as Config
 
 from Mini.miniToolbars import playToolbar
 from Mini.miniToolbars import recordToolbar
@@ -55,7 +55,7 @@ class miniTamTamMain(gtk.EventBox):
         self.instrument = 'ocarina'
         self.regularity = 0.75
         self.beat = 4
-        self.reverb = 0.
+        self.reverb = 0.1
         self.tempo = Config.PLAYER_TEMPO
         self.beatDuration = 60.0/self.tempo
         self.ticksPerSecond = Config.TICKS_PER_BEAT*self.tempo/60.0
@@ -71,7 +71,7 @@ class miniTamTamMain(gtk.EventBox):
         for i in range(21):
             self.csnd.setTrackVolume( 100, i )
 
-        self.volume = 150
+        self.volume = 100
         self.csnd.setMasterVolume(self.volume)
         self.sequencer.beat = self.beat
         self.loop.beat = self.beat
@@ -336,7 +336,7 @@ class miniTamTamMain(gtk.EventBox):
             self.loopSettings.setButtonState()
             self.loopSettingsPopup.show()
             self.loopSettingsPopup.move( 600, 200 )
-            self.timeoutLoad = gobject.timeout_add(1000, self.load_ls_instrument, soundName, soundLength)
+            self.timeoutLoad = gobject.timeout_add(2000, self.load_ls_instrument, soundName, soundLength)
         else:
             self.loopSettingsPopup.hide()
 
diff --git a/TamTamMini.activity/Mini/miniToolbars.py b/TamTamMini.activity/Mini/miniToolbars.py
index 89f623b..8608673 100644
--- a/TamTamMini.activity/Mini/miniToolbars.py
+++ b/TamTamMini.activity/Mini/miniToolbars.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import gtk
-import Config
+import common.Config as Config
 
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.toggletoolbutton import ToggleToolButton
@@ -66,7 +66,7 @@ class playToolbar(gtk.Toolbar):
         self.reverbSliderImgRightTool = gtk.ToolItem()
         self.reverbSliderImgRightTool.add(self.reverbSliderImgRight)
 
-        self.reverbSliderAdj = gtk.Adjustment(value=0, lower=0, upper=1, step_incr=0.1, page_incr=0, page_size=0)
+        self.reverbSliderAdj = gtk.Adjustment(value=0.1, lower=0, upper=1, step_incr=0.1, page_incr=0, page_size=0)
         self.reverbSliderAdj.connect("value_changed" , self.miniTamTam.handleReverbSlider)
         self.reverbSlider =  gtk.HScale(adjustment = self.reverbSliderAdj)
         self.reverbSlider.set_size_request(250,15)
diff --git a/TamTamMini.activity/TamTamMini.py b/TamTamMini.activity/TamTamMini.py
index 2030a10..6823ced 100644
--- a/TamTamMini.activity/TamTamMini.py
+++ b/TamTamMini.activity/TamTamMini.py
@@ -8,7 +8,7 @@ import gtk
 import gobject
 import time
 
-import Config
+import common.Config as Config
 from   common.Util.CSoundClient import new_csound_client
 from   common.Util.Profiler import TP
 
diff --git a/common/Config.py b/common/Config.py
index 73bd3f8..a86130e 100644
--- a/common/Config.py
+++ b/common/Config.py
@@ -127,7 +127,7 @@ _addInstrument( "ounk", INST_SIMP, MID, 'animals', 0, 0, 0, 1 )
 _addInstrument( "gam", INST_TIED, HIGH, 'percussions', .69388, .7536, .02922, 1 )
 _addInstrument( "guit", INST_TIED, MID, 'strings', .08592, .75126, .33571, 1 )
 _addInstrument( "koto", INST_TIED, HIGH, 'strings', .56523, .70075, .05954, 1 )
-_addInstrument( "clarinette", INST_TIED, MID, 'winds', .57905, .73319, .04934, 1 )
+_addInstrument( "clarinette", INST_TIED, MID, 'winds', 1.635276375, 2.72956523438, .2, 1 )
 _addInstrument( "flute", INST_TIED, MID, 'winds', .47169, .53693, .02481, 1 )
 _addInstrument( "drum1hatpedal", INST_SIMP, MID, 'percussions', 0, 0, 0, 1 )
 _addInstrument( "drum1hatshoulder", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1 )
@@ -180,10 +180,10 @@ _addInstrument( "ow", INST_SIMP, MID, 'people', 0, 0, 0, 1 )
 _addInstrument( "sheep", INST_SIMP, MID, 'animals', 0, 0, 0, 1 )
 _addInstrument( "water", INST_SIMP, MID, 'concret', 0, 0, 0, 1 )
 _addInstrument( "zap", INST_TIED, MID, 'keyboard', .299, .7323, .09895, 1 )
-_addInstrument( "trumpet", INST_TIED, MID, 'winds', .39934, .45537, .02729, 1)
-_addInstrument( "bubbles", INST_TIED, MID, "melo", 'concret', 0.02, 1.177, 0.02, 1)
-_addInstrument( "marimba", INST_TIED, MID, "melo", 'percussions', .26545, .33098, .03087, 1)
-_addInstrument( "triangle", INST_TIED, MID, "melo", 'percussions', 1.21002, 1.31805, .01268, 1)
+_addInstrument( "trumpet", INST_TIED, MID, 'winds', .91195, 1.652909375, .05375, 1)
+_addInstrument( "bubbles", INST_TIED, MID, 'concret', 0.02, 1.177, 0.02, 1)
+_addInstrument( "marimba", INST_TIED, MID, 'percussions', .18883789, .343623047, .07625, 1)
+_addInstrument( "triangle", INST_TIED, MID, 'percussions', 2.27261836, 3.2965453, .2, 1)
 _addInstrument( "laugh", INST_SIMP, MID, 'people', 0, 0, 0, 1 )
 _addInstrument( "voix", INST_TIED, MID, 'people', .89608, .96092, .02343, 1 )
 _addInstrument( "cling", INST_TIED, MID, 'keyboard', .09096, .7878, .18026, 1 )
@@ -193,15 +193,15 @@ _addInstrument( "basse", INST_TIED, MID, 'strings', 0.50470875, 0.833315, 0.0937
 _addInstrument( "acguit", INST_TIED, MID, 'strings', 1.4037, 1.84235625, 0.2, 1 )
 _addInstrument( "diceinst", INST_SIMP, MID, 'concret', 0, 0, 0, 1 )
 _addInstrument( "didjeridu", INST_TIED, LOW, 'winds', .55669, 1.73704, .09178, 4. )
-_addInstrument( "harmonium", INST_TIED, MID, 'keyboard', .04674, .41073, .18384, 1 )
+_addInstrument( "harmonium", INST_TIED, MID, 'keyboard', .242032, .898165625, .2, 1 )
 _addInstrument( "horse", INST_SIMP, MID, 'animals', 0, 0, 0, 1 )
 _addInstrument( "kalimba", INST_TIED, MID, 'percussions', .20751, .30161, .04658, 1 )
-_addInstrument( "mando", INST_TIED, MID, 'strings', 0.316548, 0.532008, 0.02875, 1 )
+_addInstrument( "mando", INST_TIED, MID, 'strings', 0.507107031, 0.934144531, 0.2, 1 )
 _addInstrument( "ocarina", INST_TIED, MID, 'winds', .06612, .19033, .01776, 1 )
 _addInstrument( "rhodes", INST_TIED, MID, 'keyboard', 0.58100625, 0.821625, 0.067, 1 )
-_addInstrument( "saxo", INST_TIED, MID, 'winds', .53722, .6583, .05264, 1 )
+_addInstrument( "saxo", INST_TIED, MID, 'winds', 1.161051953, 3.001209765, .05, 1 )
 _addInstrument( "shenai", INST_TIED, MID, 'winds', .29003, .33072, .00634, 1 )
-_addInstrument( "sitar", INST_TIED, MID, 'strings', .63187, .67882, .01654, 1 )
+_addInstrument( "sitar", INST_TIED, MID, 'strings', 1.1361625, 1.575134375, .183, 1 )
 _addInstrument( "tuba", INST_TIED, LOW, 'winds', .51063, .58384, .035, 1 )
 _addInstrument( "violin", INST_TIED, MID, 'strings', .105, .30656, .028, 1 )
 _addInstrument( "guidice1", INST_SIMP, MID, 'concret', 0, 0, 0, 1 )
@@ -242,9 +242,9 @@ _addInstrument( "drum5bongograveouvert", INST_SIMP, HIGH, 'percussions', 0, 0, 0
 _addInstrument( "camera", INST_SIMP, MID, 'concret', 0, 0, 0, 1 )
 _addInstrument( "car", INST_TIED, MID, 'concret', .67, 1.05761, .01, 1 )
 _addInstrument( "cello", INST_TIED, MID, 'strings', 0.4761, 0.92244375, 0.19125, .75 )
-_addInstrument( "chimes", INST_TIED, MID, 'percussions', .09, 2.97633, .01, 1 )
+_addInstrument( "chimes", INST_TIED, MID, 'percussions', 4.104825, 5.644134375, .02, 1 )
 _addInstrument( "crash", INST_SIMP, MID, 'concret', 0, 0, 0, 1 )
-_addInstrument( "guit2", INST_TIED, MID, 'strings', .33, 1.1583, .02, 1 )
+_addInstrument( "guit2", INST_TIED, MID, 'strings', 1.186341406, 1.929568266, .2, 1 )
 _addInstrument( "plane", INST_SIMP, MID, 'concret', 0, 0, 0, 1 )
 _addInstrument( "slap", INST_SIMP, MID, 'concret', 0, 0, 0, 1 )
 
diff --git a/common/Resources/Sounds/chimes b/common/Resources/Sounds/chimes
index f83e23c..01c80e4 100755
--- a/common/Resources/Sounds/chimes
+++ b/common/Resources/Sounds/chimes
diff --git a/common/Resources/Sounds/clarinette b/common/Resources/Sounds/clarinette
index 329974e..5ed08c2 100755
--- a/common/Resources/Sounds/clarinette
+++ b/common/Resources/Sounds/clarinette
diff --git a/common/Resources/Sounds/guit2 b/common/Resources/Sounds/guit2
index 1495832..fcb9163 100755
--- a/common/Resources/Sounds/guit2
+++ b/common/Resources/Sounds/guit2
diff --git a/common/Resources/Sounds/harmonium b/common/Resources/Sounds/harmonium
index 90a5630..5bc5fcb 100755
--- a/common/Resources/Sounds/harmonium
+++ b/common/Resources/Sounds/harmonium
diff --git a/common/Resources/Sounds/mando b/common/Resources/Sounds/mando
index 88c8484..092125b 100755
--- a/common/Resources/Sounds/mando
+++ b/common/Resources/Sounds/mando
diff --git a/common/Resources/Sounds/marimba b/common/Resources/Sounds/marimba
index 331b1db..489ba71 100755
--- a/common/Resources/Sounds/marimba
+++ b/common/Resources/Sounds/marimba
diff --git a/common/Resources/Sounds/saxo b/common/Resources/Sounds/saxo
index f422c74..e41e3c5 100755
--- a/common/Resources/Sounds/saxo
+++ b/common/Resources/Sounds/saxo
diff --git a/common/Resources/Sounds/sitar b/common/Resources/Sounds/sitar
index 9ba4df5..6fdc321 100755
--- a/common/Resources/Sounds/sitar
+++ b/common/Resources/Sounds/sitar
diff --git a/common/Resources/Sounds/triangle b/common/Resources/Sounds/triangle
index d916fd0..8c3c1b9 100755
--- a/common/Resources/Sounds/triangle
+++ b/common/Resources/Sounds/triangle
diff --git a/common/Resources/Sounds/trumpet b/common/Resources/Sounds/trumpet
index a858a96..3ce006d 100755
--- a/common/Resources/Sounds/trumpet
+++ b/common/Resources/Sounds/trumpet
diff --git a/common/Resources/tamtamorc.csd b/common/Resources/tamtamorc.csd
index a39df96..37129fb 100644
--- a/common/Resources/tamtamorc.csd
+++ b/common/Resources/tamtamorc.csd
@@ -507,6 +507,11 @@ aRight  butterlp        gaoutR, 7500
 aLeft   eqfil       aLeft, 4000, 1000, 0.125
 aRight  eqfil       aRight, 4000, 1000, 0.125
 
+aLeft   butterhp    aLeft, 150
+aRight  butterhp    aRight, 150
+aLeft   butterhp    aLeft, 150
+aRight  butterhp    aRight, 150
+
 aOutLeft dcblock (arev + aLeft) * koutGain * gkduck
 aOutRight dcblock (arev + aRight) * koutGain * gkduck
 gaRecL  =   aOutLeft
@@ -783,7 +788,7 @@ kvibrato    oscil   .006, ivibRand, 1
 
            	tigoto  tieskip
 
-a1	     flooper2	1, 1+kvibrato, kstart, kend, kdur, 4999, 0, 0, 0, iskip
+a1	     flooper2	0.5, 1+kvibrato, kstart, kend, kdur, 4999, 0, 0, 0, iskip
 
 a1      =   a1*kenv
 
@@ -802,7 +807,7 @@ instr 5023
 
 p3      =   nsamp(4999) * giScale
 
-a1      loscil  1, 1, 4999, 1
+a1      loscil  0.5, 1, 4999, 1
 
 kenv   adsr     0.005, 0.05, .8, 0.1
 
diff --git a/common/Util/CSoundClient.py b/common/Util/CSoundClient.py
index e626320..e3963cf 100644
--- a/common/Util/CSoundClient.py
+++ b/common/Util/CSoundClient.py
@@ -312,9 +312,7 @@ class _CSoundClientPlugin:
                 else:
                     instrument_id_offset = 100
 
-        amplitude = amplitude / sqrt(pitch) #instrument.ampScale
-        #print "%f * %f = %f" % (amplitude, instrument.ampScale, amplitude * instrument.ampScale)
-        #print "instrument %s final amplitude: %f" % (instrument.name, amplitude)
+        amplitude = amplitude / sqrt(pitch) * instrument.ampScale
         rval[0] = (instrument.csoundInstrumentId + \
                 (trackId+1) + instrument_id_offset) + trackId * 0.01
         rval[1] = onset
diff --git a/common/Util/LoopSettings.py b/common/Util/LoopSettings.py
index 408b4d0..a717089 100644
--- a/common/Util/LoopSettings.py
+++ b/common/Util/LoopSettings.py
@@ -212,7 +212,6 @@ class LoopSettings( gtk.VBox ):
         self.setChannel('ldur', self.dur)
 
     def handlePlayButton(self, widget, data=None):
-        print widget.get_active()
         if self.ok:
             self.playFunction(widget.get_active(), self.loopedSound)
             if self.loopedSound == False and widget.get_active() == False: