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

Removed extra newline from STREAM_READY trigger, removed superfluous log message.

Browse source
This commit is contained in:
Thulinma 2016-10-16 20:16:57 +02:00
parent b4951ff2ea
commit df4a71719d
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/controller/controller_streams.cpp
View file

@ -266,7 +266,6 @@ namespace Controller {
jsonForEach(out, jit) { jsonForEach(out, jit) {
if ( !in.isMember(jit.key())){ if ( !in.isMember(jit.key())){
toDelete.insert(jit.key()); toDelete.insert(jit.key());
Log("STRM", std::string("Deleted stream ") + jit.key());
} }
} }
//actually delete the streams //actually delete the streams

2
src/input/input.cpp
View file

@ -197,7 +197,7 @@ namespace Mist {
userPage.init(userPageName, PLAY_EX_SIZE, true); userPage.init(userPageName, PLAY_EX_SIZE, true);
/*LTS-START*/ /*LTS-START*/
if(Triggers::shouldTrigger("STREAM_READY", config->getString("streamname"))){ if(Triggers::shouldTrigger("STREAM_READY", config->getString("streamname"))){
std::string payload = config->getString("streamname")+"\n" +capa["name"].asStringRef()+"\n"; std::string payload = config->getString("streamname")+"\n" +capa["name"].asStringRef();
if (!Triggers::doTrigger("STREAM_READY", payload, config->getString("streamname"))){ if (!Triggers::doTrigger("STREAM_READY", payload, config->getString("streamname"))){
config->is_active = false; config->is_active = false;
} }