Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Martin Konecny 2012-08-31 12:18:48 -04:00
commit 0ceb0167fe
8 changed files with 48 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/media-monitor2/media/monitor/pure.py
View file

@ -15,7 +15,7 @@ from configobj import ConfigObj
from media.monitor.exceptions import FailedToSetLocale, FailedToCreateDir
#supported_extensions = [u"mp3", u"ogg", u"oga"]
supported_extensions = [u"mp3", u"ogg", u"oga", u"flac", u"aac", u"bwf"]
supported_extensions = [u"mp3", u"ogg", u"oga", u"flac", u"aac", u"wav"]
unicode_unknown = u'unknown'
path_md = ['MDATA_KEY_TITLE', 'MDATA_KEY_CREATOR', 'MDATA_KEY_SOURCE',

2
python_apps/pypo/install/pypo-initialize.py
View file

@ -81,7 +81,7 @@ try:
(codename, fullname) = get_os_codename()
print " Found %s (%s) on %s architecture" % (fullname, codename, arch)
print " * Installing Liquidsoap binary"
print " * Creating symlink to Liquidsoap binary"
p = Popen("which liquidsoap", shell=True, stdout=PIPE)
liq_path = p.communicate()[0].strip()