Some recoding work, added ogg encoder.

1 files changed, 4 insertions, 2 deletions

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: