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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	lib/stream.cpp
This commit is contained in:
Thulinma 2017-06-23 15:06:59 +02:00
commit 0e1a18986a
6 changed files with 358 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/stream.h
View file

@ -13,6 +13,6 @@ namespace Util {
bool startInput(std::string streamname, std::string filename = "", bool forkFirst = true, bool isProvider = false);
int startPush(const std::string & streamname, std::string & target);
JSON::Value getStreamConfig(std::string streamname);
uint8_t getStreamStatus(std::string & streamname);
uint8_t getStreamStatus(const std::string & streamname);
}