From feaa2d5f9086b8d9905be30e0f8e996adf14c526 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 1 May 2012 15:16:44 +0200 Subject: [PATCH] Fixed Buffer bootup, added "copy" preset handling. --- Controller/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Controller/main.cpp b/Controller/main.cpp index 6fdcc4d2..bf8f5afb 100644 --- a/Controller/main.cpp +++ b/Controller/main.cpp @@ -225,10 +225,10 @@ void startStream(std::string name, JSON::Value & data){ std::string cmd1, cmd2; if (URL.substr(0, 4) == "push"){ std::string pusher = URL.substr(7); - cmd2 = "MistBuffer 500 "+name+" "+pusher; + cmd2 = "MistBuffer "+name+" "+pusher; Util::Procs::Start(name, cmd2); }else{ - if (preset == ""){ + if (preset == "" || preset == "copy"){ cmd1 = "cat "+URL; }else{ cmd1 = "ffmpeg -re -async 2 -i "+URL+" "+preset+" -f flv -";