From 558dd72ba12df2e1399e7a400e368580add89aaf Mon Sep 17 00:00:00 2001
From: Oli <olivier.belanger@umontreal.ca>
Date: Thu, 13 Dec 2007 21:56:12 +0000
Subject: wap icons, fix samples bug in SynthLab

---
(limited to 'TamTamSynthLab.activity/SynthLab/SynthLabMain.py')

diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
index a24e4f9..ace1a9d 100644
--- a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
+++ b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
@@ -368,7 +368,9 @@ class SynthLabMain(gtk.EventBox):
             if SynthLabConstants.SYNTHTYPES[self.objectType][self.choosenType] == SynthLabConstants.VCO:
                 return SynthLabConstants.VCO_WAVEFORMS[int(self.slider2Val)]
             elif SynthLabConstants.SYNTHTYPES[self.objectType][self.choosenType] == SynthLabConstants.SAMPLE or SynthLabConstants.SYNTHTYPES[self.objectType][self.choosenType] == SynthLabConstants.GRAIN:
-                return self.sample_names[int(self.slider2Val)]
+		sname = self.sample_names[int(self.slider2Val)]
+                self.csnd.load_instrument(sname)
+                return sname
             elif SynthLabConstants.SYNTHTYPES[self.objectType][self.choosenType] == SynthLabConstants.VOICE:
                 return SynthLabConstants.VOWEL_TYPES[int(self.slider2Val)]
             else:
@@ -1435,4 +1437,4 @@ class SynthLabMain(gtk.EventBox):
         f = shelve.open( Config.TAM_TAM_ROOT + '/common/Resources/SynthFiles/' + preset, 'r')
         self.loadState(f)
         f.close()
-        self.handleSaveTemp()
\ No newline at end of file
+        self.handleSaveTemp()
--
cgit v0.9.1