Merge branch '2.3.x' into devel

2013-02-20 14:42:35 -05:00 · 2013-02-20 14:42:35 -05:00 · 168a364da5
commit 168a364da5
parent 176e78632f 8f53871ddc
2 changed files with 6 additions and 2 deletions
--- a/python_apps/media-monitor2/media/metadata/process.py
+++ b/python_apps/media-monitor2/media/metadata/process.py
@ -174,7 +174,8 @@ def normalize_mutagen(path):
    try:
        command = ['silan', '-f', 'JSON', md['path']]
        proc = subprocess.Popen(command, stdout=subprocess.PIPE)
-        out = proc.stdout.read()
+        out = proc.communicate()[0].strip('\r\n')
+
        info = json.loads(out)
        md['cuein'] = info['sound'][0][0]
        md['cueout'] = info['sound'][-1][1]