From 9bf4b3ccc2684c108ec0228578911f4a8dc0b6b1 Mon Sep 17 00:00:00 2001
From: James <olpc@localhost.localdomain>
Date: Mon, 29 Jan 2007 12:03:33 +0000
Subject: merged

---
(limited to 'Util/CSoundNote.py')

diff --git a/Util/CSoundNote.py b/Util/CSoundNote.py
index 77ea459..6e3424d 100644
--- a/Util/CSoundNote.py
+++ b/Util/CSoundNote.py
@@ -3,13 +3,11 @@ from Util.CSoundClient import CSoundClient
 from Generation.GenerationConstants import GenerationConstants
 
 from Util.Clooper.SClient import *
-from sugar import env
 
 def CSound_loadInstruments( ):
-    home_path = env.get_profile_path() + Config.PREF_DIR
     for instrumentSoundFile in Config.INSTRUMENTS.keys():
         if instrumentSoundFile[0:3] == 'mic' or instrumentSoundFile[0:3] == 'lab':
-            fileName = home_path + '/' + instrumentSoundFile
+            fileName = Config.PREF_DIR + '/' + instrumentSoundFile
         else:
             fileName = Config.SOUNDS_DIR + "/" + instrumentSoundFile
         instrumentId = Config.INSTRUMENT_TABLE_OFFSET + Config.INSTRUMENTS[ instrumentSoundFile ].instrumentId
@@ -83,7 +81,7 @@ def CSound_playNote( loopMode, secs_per_tick,
                 Config.INSTRUMENTS[ instr ].loopEnd,
                 Config.INSTRUMENTS[ instr ].crossDur )
     else:
-        sc_scoreEvent15( 0, 'i',
+        sc_scoreEvent15( 'i',
                 Config.INSTRUMENTS[ instr ].csoundInstrumentId + trackId * 0.01,
                 onset * secs_per_tick,
                 duration,
--
cgit v0.9.1