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

Made Util::streamName and exitReason thread-local

Browse source
This commit is contained in:
Thulinma 2020-08-28 19:23:48 +02:00
parent 7c6da9d455
commit 7423868de4
11 changed files with 40 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/process/process_exec.h
View file

@ -46,7 +46,7 @@ namespace Mist{
streamName = opt["sink"].asString();
if (!streamName.size()){streamName = opt["source"].asString();}
Util::streamVariables(streamName, opt["source"].asString());
Util::streamName = opt["source"].asString() + "→" + streamName;
Util::setStreamName(opt["source"].asString() + "→" + streamName);
}
bool needsLock(){return false;}
bool isSingular(){return false;}

2
src/process/process_ffmpeg.cpp
View file

@ -389,7 +389,7 @@ namespace Mist{
streamName = opt["sink"].asString();
if (!streamName.size()){streamName = opt["source"].asString();}
Util::streamVariables(streamName, opt["source"].asString());
Util::streamName = opt["source"].asString() + "→" + streamName;
Util::setStreamName(opt["source"].asString() + "→" + streamName);
}
std::string EncodeOutputEBML::getTrackType(int tid){return M.getType(tid);}

2
src/process/process_livepeer.cpp
View file

@ -227,7 +227,7 @@ namespace Mist{
streamName = opt["sink"].asString();
if (!streamName.size()){streamName = opt["source"].asString();}
Util::streamVariables(streamName, opt["source"].asString());
Util::streamName = opt["source"].asString() + "→" + streamName;
Util::setStreamName(opt["source"].asString() + "→" + streamName);
preRun();
};
virtual bool needsLock(){return false;}