security model, cleanup, SynthLab to OGG

4 files changed, 7 insertions, 14 deletions

diff --git a/common/Config.py b/common/Config.py
index 0bf0210..474bd82 100644
--- a/common/Config.py
+++ b/common/Config.py
@@ -46,7 +46,6 @@ if SugarMode == True:
     INSTANCE_DIR = os.path.join(get_activity_root(), 'instance')
     DATA_DIR = os.path.join(get_activity_root(), 'data')
     TMP_DIR = os.path.join(get_activity_root(), 'tmp')
-    SNDS_DIR = DATA_DIR
 
     SNDS_INFO_DIR = os.path.join(get_activity_root(), 'data', 'snds_info')
 
diff --git a/common/Resources/tamtamorc.csd b/common/Resources/tamtamorc.csd
index 1563a9f..f0a63f1 100644
--- a/common/Resources/tamtamorc.csd
+++ b/common/Resources/tamtamorc.csd
@@ -1107,7 +1107,7 @@ f32 0 1024 10 1 0 .1 0 .3 .2 0 0 .1
 f33 0 1024 10 1 0 0 0 .1 0 0 .2 .1 0 0 .1
 f34 0 1024 10 1 .6 0 0 .4 .2 .1 0 0 .1
 f35 0 1024 10 1 .5 .3 0 .1 0 0 0 .1 .1
-f36 0 1024 10 1 0 .6 .4 .1 0 0 .2 .1 0 0 ,1
+f36 0 1024 10 1 0 .6 .4 .1 0 0 .2 .1 0 0 .1
 f37 0 1024 10 1 0 0 0 .1 .2 .1 0 0 0 .1 0 0 .1
 f38 0 1024 10 1 .4 .3 0 .1 .2 .1 .1 .1 0 0 0 0 .1 .05
 f39 0 1024 10 1 0  .5 0 0 .3  0 0 .2 0 .1 0 0 0 0 .2 0 0 0 .05 0 0 0 0 .03 ; ADDITIVE SYNTHESIS WAVE
diff --git a/common/Util/CSoundClient.py b/common/Util/CSoundClient.py
index 69ed50f..2ce3238 100644
--- a/common/Util/CSoundClient.py
+++ b/common/Util/CSoundClient.py
@@ -79,26 +79,23 @@ class _CSoundClientPlugin:
         sc_inputMessage( Config.CSOUND_MIC_RECORD % table )
 
     def load_mic_instrument( self, inst ):
-        fileName = Config.SNDS_DIR + '/' + inst
+        fileName = Config.DATA_DIR + '/' + inst
         instrumentId = Config.INSTRUMENT_TABLE_OFFSET + self.instrumentDB.instNamed[inst].instrumentId
         sc_inputMessage(Config.CSOUND_LOAD_INSTRUMENT % (instrumentId, fileName))
 
     def load_synth_instrument( self, inst ):
-        fileName = Config.SNDS_DIR + '/' + inst
+        fileName = Config.DATA_DIR + '/' + inst
         instrumentId = Config.INSTRUMENT_TABLE_OFFSET + self.instrumentDB.instNamed[inst].instrumentId
         sc_inputMessage(Config.CSOUND_LOAD_INSTRUMENT % (instrumentId, fileName))
 
     def load_ls_instrument( self, inst ):
-        fileName = Config.SNDS_DIR + '/' + inst
+        fileName = Config.DATA_DIR + '/' + inst
         sc_inputMessage(Config.CSOUND_LOAD_LS_INSTRUMENT % fileName)
 
     def load_instruments( self ):
         for instrumentSoundFile in self.instrumentDB.instNamed.keys():
             if instrumentSoundFile[0:3] == 'mic' or instrumentSoundFile[0:3] == 'lab' or self.instrumentDB.instNamed[instrumentSoundFile].category == 'mysounds':
-                try:
-                    fileName = Config.JAM_DIR + '/' + instrumentSoundFile
-                except:
-                    fileName = Config.SNDS_DIR + '/' + instrumentSoundFile
+                fileName = Config.DATA_DIR + '/' + instrumentSoundFile
             else:
                 fileName = Config.SOUNDS_DIR + "/" + instrumentSoundFile
             instrumentId = Config.INSTRUMENT_TABLE_OFFSET + self.instrumentDB.instNamed[ instrumentSoundFile ].instrumentId
@@ -107,10 +104,7 @@ class _CSoundClientPlugin:
     def load_instrument(self, inst):
         if not inst in loadedInstruments:
             if inst[0:3] == 'mic' or inst[0:3] == 'lab' or self.instrumentDB.instNamed[inst].category == 'mysounds':
-                try:
-                    fileName = Config.JAM_DIR + '/' + inst
-                except:
-                    fileName = Config.SNDS_DIR + '/' + inst
+                fileName = Config.DATA_DIR + '/' + inst
             else:
                 fileName = Config.SOUNDS_DIR + "/" + inst
             instrumentId = Config.INSTRUMENT_TABLE_OFFSET + self.instrumentDB.instNamed[ inst ].instrumentId
diff --git a/common/Util/LoopSettings.py b/common/Util/LoopSettings.py
index f389275..d672050 100644
--- a/common/Util/LoopSettings.py
+++ b/common/Util/LoopSettings.py
@@ -152,7 +152,7 @@ class LoopSettings( gtk.VBox ):
         ofile.write(name + ' ' + tied + ' ' + register + ' ' + melo + ' ' + category + ' ' + start + ' ' + end + ' ' + dur + '\n')
 
         ofile.close()
-        (s,o) = commands.getstatusoutput('cp ' + Config.SNDS_DIR + '/' + self.oldName + ' ' + Config.SNDS_DIR + '/' + name)
+        (s,o) = commands.getstatusoutput('cp ' + Config.DATA_DIR + '/' + self.oldName + ' ' + Config.DATA_DIR + '/' + name)
         self.doneLoopSettingsPopup()
 
     def set_name(self, name):