From 65aad94f2457a1615283dc4e32513951bab5b6be Mon Sep 17 00:00:00 2001
From: boyska <piuttosto@logorroici.org>
Date: Mon, 14 Apr 2014 18:50:50 +0200
Subject: [PATCH] Closes #14: make ffmpeg binary configurable

---
 server/default_config.py | 1 +
 server/forge.py          | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/default_config.py b/server/default_config.py
index 54567a0..8305fb7 100644
--- a/server/default_config.py
+++ b/server/default_config.py
@@ -22,3 +22,4 @@ AUDIO_OUTPUT_FORMAT = 'techrec-%(time)s-%(name)s.mp3'
 FORGE_TIMEOUT = 20
 FORGE_MAX_DURATION = 3600*5
 FFMPEG_OPTIONS = ['-loglevel', 'warning', '-n']
+FFMPEG_PATH = 'ffmpeg'
diff --git a/server/forge.py b/server/forge.py
index 260cf66..310c458 100644
--- a/server/forge.py
+++ b/server/forge.py
@@ -59,8 +59,7 @@ def mp3_join(named_intervals, target):
     This function make the (quite usual) assumption that the only start_cut (if
     any) is at the first file, and the last one is at the last file
     '''
-    # TODO: ffmpeg binary should be configurable
-    ffmpeg = 'ffmpeg'  # binary name
+    ffmpeg = get_config()['FFMPEG_PATH']
     startskip = None
     endskip = None
     files = []