hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Buffer bootup, added "copy" preset handling.

Browse source
This commit is contained in:
Thulinma 2012-05-01 15:16:44 +02:00
parent aaecc7e983
commit feaa2d5f90
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Controller/main.cpp
View file

@ -225,10 +225,10 @@ void startStream(std::string name, JSON::Value & data){
std::string cmd1, cmd2; std::string cmd1, cmd2;
if (URL.substr(0, 4) == "push"){ if (URL.substr(0, 4) == "push"){
std::string pusher = URL.substr(7); std::string pusher = URL.substr(7);
cmd2 = "MistBuffer 500 "+name+" "+pusher; cmd2 = "MistBuffer "+name+" "+pusher;
Util::Procs::Start(name, cmd2); Util::Procs::Start(name, cmd2);
}else{ }else{
if (preset == ""){ if (preset == "" || preset == "copy"){
cmd1 = "cat "+URL; cmd1 = "cat "+URL;
}else{ }else{
cmd1 = "ffmpeg -re -async 2 -i "+URL+" "+preset+" -f flv -"; cmd1 = "ffmpeg -re -async 2 -i "+URL+" "+preset+" -f flv -";