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

10 files changed, 14 insertions, 14 deletions

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)