diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2008-04-10 03:30:59 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2008-04-10 03:30:59 (GMT) |
| commit | 2fa8060b7fd790b3260e65d225a4eca5080683a7 (patch) | |
| tree | becc0461cffa308ecf5f77acb9ee130ada0a728c /TamTamMini.activity/Mini | |
| parent | 957af9bf585d58518bb275ec4926ed11bbd3285e (diff) | |
On the way to respect security policy
Diffstat (limited to 'TamTamMini.activity/Mini')
| -rw-r--r-- | TamTamMini.activity/Mini/miniTamTamMain.py | 9 | ||||
| -rw-r--r-- | TamTamMini.activity/Mini/miniToolbars.py | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/TamTamMini.activity/Mini/miniTamTamMain.py b/TamTamMini.activity/Mini/miniTamTamMain.py index 0ac2bcb..395bd7d 100644 --- a/TamTamMini.activity/Mini/miniTamTamMain.py +++ b/TamTamMini.activity/Mini/miniTamTamMain.py @@ -315,12 +315,13 @@ class miniTamTamMain(gtk.EventBox): self.instrumentPanelBox.remove( self.instrumentPanel ) def micRec(self, widget, mic): - os.system('rm ' + Config.SNDS_DIR + '/' + mic) + if os.path.isfile(Config.DATA_DIR + '/' + mic): + os.system('rm ' + Config.DATA_DIR + '/' + mic) self.csnd.inputMessage("i5600 0 4") - (s1,o1) = commands.getstatusoutput("arecord -f S16_LE -t wav -r 16000 -d 4 " + Config.SNDS_DIR + "/tempMic.wav") + (s1,o1) = commands.getstatusoutput("arecord -f S16_LE -t wav -r 16000 -d 4 " + Config.DATA_DIR + "/tempMic.wav") (s2, o2) = commands.getstatusoutput("csound " + Config.FILES_DIR + "/crop.csd") - (s3, o3) = commands.getstatusoutput("mv " + Config.SNDS_DIR + "/micTemp " + Config.SNDS_DIR + "/" + mic) - (s4, o4) = commands.getstatusoutput("rm " + Config.SNDS_DIR + "/tempMic.wav") + (s3, o3) = commands.getstatusoutput("mv " + Config.DATA_DIR + "/micTemp " + Config.DATA_DIR + "/" + mic) + (s4, o4) = commands.getstatusoutput("rm " + Config.DATA_DIR + "/tempMic.wav") self.micTimeout = gobject.timeout_add(200, self.loadMicInstrument, mic) self.instrumentPanel.set_activeInstrument(mic,True) self.setInstrument(mic) diff --git a/TamTamMini.activity/Mini/miniToolbars.py b/TamTamMini.activity/Mini/miniToolbars.py index 9fac3d6..6401184 100644 --- a/TamTamMini.activity/Mini/miniToolbars.py +++ b/TamTamMini.activity/Mini/miniToolbars.py @@ -172,7 +172,7 @@ class LoopSettingsPalette( Palette ): self.soundBox = gtk.HBox() self.soundLabel = gtk.Label(_('Sound: ')) self.soundMenuBox = BigComboBox() - self.sounds = os.listdir(Config.SNDS_DIR) + self.sounds = os.listdir(Config.DATA_DIR) for sound in self.sounds: self.soundMenuBox.append_item(self.sounds.index(sound), sound) self.soundMenuBox.connect('changed', self.handleSound) @@ -272,7 +272,7 @@ class LoopSettingsPalette( Palette ): def handlePopup(self, widget, data=None): self.setButtonState() self.soundMenuBox.remove_all() - self.sounds = os.listdir(Config.SNDS_DIR) + self.sounds = os.listdir(Config.DATA_DIR) for sound in self.sounds: self.soundMenuBox.append_item(self.sounds.index(sound), sound) self.nameEntry.set_text("name_of_the_sound") @@ -283,7 +283,7 @@ class LoopSettingsPalette( Palette ): def handleSound(self, widget, data=None): self.sndname = self.sounds[widget.props.value] - fullname = Config.SNDS_DIR + '/' + self.sndname + fullname = Config.DATA_DIR + '/' + self.sndname results = commands.getstatusoutput("du -b %s" % fullname) if results[0] == 0: list = results[1].split() @@ -331,7 +331,7 @@ class LoopSettingsPalette( Palette ): ofile.write(category) ofile.close() if copy: - (s,o) = commands.getstatusoutput('cp ' + Config.SNDS_DIR + '/' + oldName + ' ' + Config.SNDS_DIR + '/' + self.sndname) + (s,o) = commands.getstatusoutput('cp ' + Config.DATA_DIR + '/' + oldName + ' ' + Config.DATA_DIR + '/' + self.sndname) def set_values(self, soundLength): self.soundLength = soundLength |