From 74ad26edc2cf0d8aa8d5d485d708de1a34aa75c0 Mon Sep 17 00:00:00 2001 From: Jon Bergli Heier Date: Sun, 14 Aug 2011 21:59:35 +0200 Subject: Some recoding work, added ogg encoder. --- app.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app.py') diff --git a/app.py b/app.py index e70283c..c2ef0a3 100755 --- a/app.py +++ b/app.py @@ -65,7 +65,8 @@ class Application(object): f = File(path) # see json_play() if not os.path.splitext(path)[1] in ('.mp3', '.ogg'): - decoder, encoder = ('ffmpeg',)*2 + decoder = 'ffmpeg' + encoder = config.get('encoder') f.start_recode(decoder, encoder) start_response('200 OK', [('Content-Type', 'text/plain')]) @@ -80,7 +81,8 @@ class Application(object): # TODO: replace this with some sane logic if not os.path.splitext(path)[1] in ('.mp3', '.ogg'): cache_path = f.get_cache_path() - decoder, encoder = ('ffmpeg',)*2 + decoder = 'ffmpeg' + encoder = config.get('encoder') if not os.path.exists(cache_path): f.start_recode(decoder, encoder, environ['sessionid']) else: -- cgit v1.2.3