skyler
/
Lightningbeam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed sound import in Windows.

This commit is contained in:
Skyler Lehmkuhl 2013-01-20 19:22:47 -05:00
parent 1d08fd9587
commit 270982cce8
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lightningbeam.py
View File

@ -719,9 +719,28 @@ def import_to_stage(widget=None):
for i in ("wav", "mp3", "ogg"): for i in ("wav", "mp3", "ogg"):
if thefile.endswith(i): if thefile.endswith(i):
if i in ("mp3", "ogg"): if i in ("mp3", "ogg"):
if svlgui.PLATFORM=="win32":
if os.system("C:\\Progra~2\\MPlayer\\mplayer.exe")!=0:
if os.system("C:\\Progra~1\\MPlayer\\mplayer.exe")!=0:
result = svlgui.alert("To import mp3 and ogg files you must install mplayer. This will take about 3 MB of space. Install?", confirm=True)
if not result:
return
urllib.urlretrieve("http://mplayer.kenkon.net/files/mplayer-win32-mingw-dev-svn20061001.exe", "mplayerdl.exe")
os.system("mplayerdl.exe")
mpath = "C:\\Progra~2\\MPlayer\\mplayer.exe"
else:
mpath = "C:\\Progra~1\\MPlayer\\mplayer.exe"
else:
mpath = "C:\\Progra~2\\MPlayer\\mplayer.exe"
else:
mpath = "mplayer"
theorigfile = thefile theorigfile = thefile
thefile = svlgui.SECURETEMPDIR+"/"+thefile.split('/')[-1]+'.wav' thefile = svlgui.SECURETEMPDIR+svlgui.sep+thefile.split(svlgui.sep)[-1].replace(" ","_").replace("-","_").split(".")[0]+'.wav'
os.system('mplayer -srate 48000 -vo null -vc null -ao pcm:fast:file="'+thefile+'" "'+theorigfile+'"') print mpath+' -srate 48000 -vo null -vc null -ao pcm:fast:file="'+thefile+'" "'+theorigfile+'"'
if svlgui.PLATFORM=="win32":
os.system(mpath+' -srate 48000 -vo null -vc null -ao pcm:fast:file=\\"'+thefile+'\\" "'+theorigfile+'"')
else:
os.system(mpath+' -srate 48000 -vo null -vc null -ao pcm:fast:file="'+thefile+'" "'+theorigfile+'"')
if svlgui.PLATFORM=="osx": if svlgui.PLATFORM=="osx":
if not os.path.exists('sox/sox'): if not os.path.exists('sox/sox'):
try: try:
@ -751,6 +770,15 @@ def import_to_stage(widget=None):
os.system("""osascript -e 'do shell script "easy_install numpy" with administrator privileges'""") os.system("""osascript -e 'do shell script "easy_install numpy" with administrator privileges'""")
import numpy as NP import numpy as NP
SOX_EXEC = 'sox/sox' SOX_EXEC = 'sox/sox'
elif svlgui.PLATFORM=="win32":
SOX_EXEC = "C:\\Progra~2\\sox-14~1\\sox.exe"
if not os.path.exists(SOX_EXEC):
if os.path.exists("C:\\Progra~1\\sox-14~1\\sox.exe"):
SOX_EXEC = "C:\\Progra~1\\sox-14~1\\sox.exe"
else:
urllib.urlretrieve("http://downloads.sourceforge.net/project/sox/sox/14.4.0/sox-14.4.0-win32.exe?r=&ts=1358725954&use_mirror=iweb", 'sox.exe')
os.system("sox.exe")
import numpy as NP
elif "linux" in svlgui.PLATFORM: elif "linux" in svlgui.PLATFORM:
import numpy as NP import numpy as NP
SOX_EXEC = "sox" SOX_EXEC = "sox"
@ -768,9 +796,9 @@ def import_to_stage(widget=None):
data = data.reshape(len(data)/num_channels, num_channels) data = data.reshape(len(data)/num_channels, num_channels)
info = subprocess.check_output([SOX_EXEC,'--i',thefile]) info = subprocess.check_output([SOX_EXEC,'--i',thefile])
if i=="mp3": if i=="mp3":
sound = svlgui.Sound(data, name=thefile.split('/')[-1], path=theorigfile, info=info, type=i) sound = svlgui.Sound(data, name=thefile.split(svlgui.sep)[-1], path=theorigfile, info=info, type=i)
else: else:
sound = svlgui.Sound(data, name=thefile.split('/')[-1], path=thefile, info=info, type=i) sound = svlgui.Sound(data, name=thefile.split(svlgui.sep)[-1], path=thefile, info=info, type=i)
root.descendItem().add(sound) root.descendItem().add(sound)
break break

2
svlgui.py
View File

@ -2045,7 +2045,7 @@ class Sound:
def hitTest(self, x, y): def hitTest(self, x, y):
return False return False
def print_sc(self): def print_sc(self):
retval = ".sound "+self.name+" \""+self.path+"\"\n" retval = ".sound "+self.name+" \""+self.path.replace("\\","\\\\")+"\"\n"
return retval return retval
def print_html(self): def print_html(self):
retval = "var "+self.name.replace(".","_")+" = new Sound();\n"+self.name.replace(".","_")+"._sound = new Audio('"+self.path.split("/")[-1]+"');\n" retval = "var "+self.name.replace(".","_")+" = new Sound();\n"+self.name.replace(".","_")+"._sound = new Audio('"+self.path.split("/")[-1]+"');\n"