Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TamTamEdit.activity/Edit/MainWindow.py5
-rw-r--r--TamTamJam.activity/Jam/JamMain.py9
-rw-r--r--TamTamJam.activity/Jam/Toolbars.py5
-rw-r--r--TamTamMini.activity/Mini/miniTamTamMain.py9
-rw-r--r--TamTamMini.activity/Mini/miniToolbars.py5
-rw-r--r--TamTamSynthLab.activity/SynthLab/SynthLabMain.py13
-rw-r--r--common/Util/OS.py12
7 files changed, 38 insertions, 20 deletions
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py
index b120f99..5b0b9bd 100644
--- a/TamTamEdit.activity/Edit/MainWindow.py
+++ b/TamTamEdit.activity/Edit/MainWindow.py
@@ -23,6 +23,7 @@ import time
import os
import commands
import random
+from common.Util import OS
class CONTEXT:
PAGE = 0
@@ -724,8 +725,8 @@ class MainWindow( gtk.EventBox ):
self.audioRecordState = False
command = "gst-launch-0.10 filesrc location=" + Config.TMP_DIR + "/perf.wav ! wavparse ! audioconvert ! vorbisenc ! oggmux ! filesink location=" + self.audioFileName
command2 = "rm " + Config.TMP_DIR + "/perf.wav"
- (status, output) = commands.getstatusoutput(command)
- (status2, output2) = commands.getstatusoutput(command2)
+ OS.system(command)
+ OS.system(command2)
jobject = datastore.create()
jobject.metadata['title'] = os.path.split(self.audioFileName)[1]
diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py
index 77e97d1..e9dde2a 100644
--- a/TamTamJam.activity/Jam/JamMain.py
+++ b/TamTamJam.activity/Jam/JamMain.py
@@ -29,6 +29,7 @@ from common.Generation.GenerationConstants import GenerationConstants
from common.Util.NoteDB import Note, Page
from common.Util import ControlStream
+from common.Util import OS
import xdrlib
import time
@@ -698,10 +699,10 @@ class JamMain(gtk.EventBox):
if os.path.isfile(os.path.join(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.DATA_DIR + "/tempMic.wav")
- (s2, o2) = commands.getstatusoutput("csound " + "--strset999=" + Config.DATA_DIR + " " + Config.FILES_DIR + "/crop.csd")
- (s3, o3) = commands.getstatusoutput("mv " + Config.DATA_DIR + "/micTemp.wav " + Config.DATA_DIR + "/" + mic)
- (s4, o4) = commands.getstatusoutput("rm " + Config.DATA_DIR + "/tempMic.wav")
+ OS.system("arecord -f S16_LE -t wav -r 16000 -d 4 " + Config.DATA_DIR + "/tempMic.wav")
+ OS.system("csound " + "--strset999=" + Config.DATA_DIR + " " + Config.FILES_DIR + "/crop.csd")
+ OS.system("mv " + Config.DATA_DIR + "/micTemp.wav " + Config.DATA_DIR + "/" + mic)
+ OS.system("rm " + Config.DATA_DIR + "/tempMic.wav")
self.csnd.load_mic_instrument(mic)
diff --git a/TamTamJam.activity/Jam/Toolbars.py b/TamTamJam.activity/Jam/Toolbars.py
index 4a1d3fc..354ec15 100644
--- a/TamTamJam.activity/Jam/Toolbars.py
+++ b/TamTamJam.activity/Jam/Toolbars.py
@@ -18,6 +18,7 @@ from sugar.graphics.toolcombobox import ToolComboBox
from common.Util.ThemeWidgets import *
import common.Config as Config
+from common.Util import OS
class JamToolbar( gtk.Toolbar ):
@@ -496,7 +497,7 @@ class LoopSettingsPalette( Palette ):
def handleSound(self, widget, data=None):
self.sndname = self.sounds[widget.props.value]
fullname = Config.DATA_DIR + '/' + self.sndname
- results = commands.getstatusoutput("du -b %s" % fullname)
+ results = OS.system("du -b %s" % fullname)
if results[0] == 0:
list = results[1].split()
soundLength = float(list[0]) / 2 / 16000.
@@ -543,7 +544,7 @@ class LoopSettingsPalette( Palette ):
ofile.write(category)
ofile.close()
if copy:
- (s,o) = commands.getstatusoutput('cp ' + Config.DATA_DIR + '/' + oldName + ' ' + Config.DATA_DIR + '/' + self.sndname)
+ OS.system('cp ' + Config.DATA_DIR + '/' + oldName + ' ' + Config.DATA_DIR + '/' + self.sndname)
def set_values(self, soundLength):
self.soundLength = soundLength
diff --git a/TamTamMini.activity/Mini/miniTamTamMain.py b/TamTamMini.activity/Mini/miniTamTamMain.py
index 6a3c1c8..28d7df5 100644
--- a/TamTamMini.activity/Mini/miniTamTamMain.py
+++ b/TamTamMini.activity/Mini/miniTamTamMain.py
@@ -33,6 +33,7 @@ from Loop import Loop
from RythmGenerator import *
from common.Util.Trackpad import Trackpad
from Mini.InstrumentPanel import InstrumentPanel
+from common.Util import OS
from gettext import gettext as _
@@ -317,10 +318,10 @@ class miniTamTamMain(gtk.EventBox):
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.DATA_DIR + "/tempMic.wav")
- (s2, o2) = commands.getstatusoutput("csound " + Config.FILES_DIR + "/crop.csd")
- (s3, o3) = commands.getstatusoutput("mv " + Config.DATA_DIR + "/micTemp " + Config.DATA_DIR + "/" + mic)
- (s4, o4) = commands.getstatusoutput("rm " + Config.DATA_DIR + "/tempMic.wav")
+ OS.system("arecord -f S16_LE -t wav -r 16000 -d 4 " + Config.DATA_DIR + "/tempMic.wav")
+ OS.system("csound " + Config.FILES_DIR + "/crop.csd")
+ OS.system("mv " + Config.DATA_DIR + "/micTemp " + Config.DATA_DIR + "/" + mic)
+ OS.system("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 81a7317..cac9786 100644
--- a/TamTamMini.activity/Mini/miniToolbars.py
+++ b/TamTamMini.activity/Mini/miniToolbars.py
@@ -5,6 +5,7 @@ import gobject
import os, commands
import common.Config as Config
from common.Util.ThemeWidgets import *
+from common.Util import OS
from sugar.graphics.toolbutton import ToolButton
from sugar.graphics.toggletoolbutton import ToggleToolButton
@@ -284,7 +285,7 @@ class LoopSettingsPalette( Palette ):
def handleSound(self, widget, data=None):
self.sndname = self.sounds[widget.props.value]
fullname = Config.DATA_DIR + '/' + self.sndname
- results = commands.getstatusoutput("du -b %s" % fullname)
+ results = OS.system("du -b %s" % fullname)
if results[0] == 0:
list = results[1].split()
soundLength = float(list[0]) / 2 / 16000.
@@ -331,7 +332,7 @@ class LoopSettingsPalette( Palette ):
ofile.write(category)
ofile.close()
if copy:
- (s,o) = commands.getstatusoutput('cp ' + Config.DATA_DIR + '/' + oldName + ' ' + Config.DATA_DIR + '/' + self.sndname)
+ OS.system('cp ' + Config.DATA_DIR + '/' + oldName + ' ' + Config.DATA_DIR + '/' + self.sndname)
def set_values(self, soundLength):
self.soundLength = soundLength
diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
index 24e6077..87ed022 100644
--- a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
+++ b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
@@ -26,6 +26,7 @@ from SynthLab.SynthLabToolbars import presetToolbar
from common.Util.Trackpad import Trackpad
from sugar.datastore import datastore
from sugar.graphics import style
+from common.Util import OS
as_window = False
@@ -526,8 +527,8 @@ class SynthLabMain(gtk.EventBox):
time.sleep(0.5)
command = "gst-launch-0.10 filesrc location=" + Config.TMP_DIR + "/lab0 ! wavparse ! audioconvert ! vorbisenc ! oggmux ! filesink location=" + self.audioFileName
command2 = "rm " + Config.TMP_DIR + "/lab0"
- (status, output) = commands.getstatusoutput(command)
- (status2, output2) = commands.getstatusoutput(command2)
+ OS.system(command)
+ OS.system(command2)
jobject = datastore.create()
jobject.metadata['title'] = os.path.split(self.audioFileName)[1]
@@ -688,10 +689,10 @@ class SynthLabMain(gtk.EventBox):
dur = self.synthObjectsParameters.sourcesParameters[(i % 4) * 4]
if os.path.isfile(Config.DATA_DIR + '/labmic' + str(snd)):
os.system('rm ' + Config.DATA_DIR + '/labmic' + str(snd))
- (s1,o1) = commands.getstatusoutput("arecord -f S16_LE -t wav -r 16000 -d " + str(dur) + " " + Config.DATA_DIR + '/tempMic.wav')
- (s2, o2) = commands.getstatusoutput("csound " + "--strset999=" + Config.DATA_DIR + " " + Config.FILES_DIR + "/cropSynthLab.csd")
- (s3, o3) = commands.getstatusoutput("mv " + Config.DATA_DIR + "/micTemp.wav " + Config.DATA_DIR + "/" + 'labmic' + str(snd))
- (s4, o4) = commands.getstatusoutput("rm " + Config.DATA_DIR + "/tempMic.wav")
+ OS.system("arecord -f S16_LE -t wav -r 16000 -d " + str(dur) + " " + Config.DATA_DIR + '/tempMic.wav')
+ OS.system("csound " + "--strset999=" + Config.DATA_DIR + " " + Config.FILES_DIR + "/cropSynthLab.csd")
+ OS.system("mv " + Config.DATA_DIR + "/micTemp.wav " + Config.DATA_DIR + "/" + 'labmic' + str(snd))
+ OS.system("rm " + Config.DATA_DIR + "/tempMic.wav")
return
def handleMotion( self, widget, event ):
diff --git a/common/Util/OS.py b/common/Util/OS.py
new file mode 100644
index 0000000..6bea80b
--- /dev/null
+++ b/common/Util/OS.py
@@ -0,0 +1,12 @@
+import commands
+import logging
+
+def system(*args):
+ cmd = ' '.join(args)
+ logging.debug('[system] %s' % cmd)
+
+ status = commands.getstatusoutput(cmd)
+ logging.debug('[system][out] %d: %s' % status)
+
+ return status
+
generated by cgit v0.9.1 at 2024-04-25 15:33:57 (GMT)