From 29df5a889a439e69b86c272f5f1b641e288fba15 Mon Sep 17 00:00:00 2001
From: emeric <emeric@nas>
Date: Sun, 14 Sep 2014 17:09:43 +0200
Subject: [PATCH] Supporting multiple transcode binaries (ffmpeg, avconv)

---
 transcode/AvConvTranscoder.cpp | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/transcode/AvConvTranscoder.cpp b/transcode/AvConvTranscoder.cpp
index 6a2b53f5..14962d59 100644
--- a/transcode/AvConvTranscoder.cpp
+++ b/transcode/AvConvTranscoder.cpp
@@ -11,15 +11,35 @@
 namespace Transcode
 {
 
+// TODO, parametrize?
+const std::vector<std::string> execNames =
+{
+	"avconv",
+	"ffmpeg",
+};
+
+
 boost::mutex	AvConvTranscoder::_mutex;
 
-boost::filesystem::path	AvConvTranscoder::_avConvPath = "";
+boost::filesystem::path	AvConvTranscoder::_avConvPath = boost::filesystem::path();
 
 void
 AvConvTranscoder::init()
 {
-	_avConvPath = boost::process::search_path("avconv");
-	LMS_LOG(MOD_TRANSCODE, SEV_INFO) << "Using execPath " << _avConvPath;
+	BOOST_FOREACH(std::string execName, execNames)
+	{
+		const boost::filesystem::path p = boost::process::search_path(execName);
+		if (!p.empty())
+		{
+			_avConvPath = p;
+			break;
+		}
+	}
+
+	if (!_avConvPath.empty())
+		LMS_LOG(MOD_TRANSCODE, SEV_INFO) << "Using transcoder " << _avConvPath;
+	else
+		LMS_LOG(MOD_TRANSCODE, SEV_ERROR) << "Cannot find any transcoder binary!";
 }
 
 
@@ -48,7 +68,7 @@ AvConvTranscoder::AvConvTranscoder(const Parameters& parameters)
 
 	std::ostringstream oss;
 
-	oss << "avconv";
+	oss << _avConvPath;
 
 	// input Offset
 	if (_parameters.getOffset().total_seconds() > 0)