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

Added DTSC stdin input

Browse source
This commit is contained in:
Thulinma 2016-09-03 14:19:49 +02:00
parent a0d54e1a95
commit 72a6816ec1
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/input/input_dtsc.cpp
View file

@ -43,7 +43,7 @@ namespace Mist {
} }
bool inputDTSC::needsLock(){ bool inputDTSC::needsLock(){
return config->getString("input").substr(0, 7) != "dtsc://"; return config->getString("input").substr(0, 7) != "dtsc://" && config->getString("input") != "-";
} }
void parseDTSCURI(const std::string & src, std::string & host, uint16_t & port, std::string & password, std::string & streamName) { void parseDTSCURI(const std::string & src, std::string & host, uint16_t & port, std::string & password, std::string & streamName) {
@ -106,7 +106,7 @@ namespace Mist {
} }
void inputDTSC::parseStreamHeader() { void inputDTSC::parseStreamHeader() {
while (srcConn.connected()){ while (srcConn.connected() && config->is_active){
srcConn.spool(); srcConn.spool();
if (srcConn.Received().available(8)){ if (srcConn.Received().available(8)){
if (srcConn.Received().copy(4) == "DTCM" || srcConn.Received().copy(4) == "DTSC") { if (srcConn.Received().copy(4) == "DTCM" || srcConn.Received().copy(4) == "DTSC") {
@ -143,6 +143,10 @@ namespace Mist {
bool inputDTSC::openStreamSource() { bool inputDTSC::openStreamSource() {
std::string source = config->getString("input"); std::string source = config->getString("input");
if (source == "-"){
srcConn = Socket::Connection(fileno(stdout),fileno(stdin));
return true;
}
if (source.find("dtsc://") == 0) { if (source.find("dtsc://") == 0) {
source.erase(0, 7); source.erase(0, 7);
} }
@ -183,10 +187,6 @@ namespace Mist {
if (!needsLock()) { if (!needsLock()) {
return true; return true;
} else { } else {
if (config->getString("input") == "-") {
std::cerr << "Input from stdin not yet supported" << std::endl;
return false;
}
if (!config->getString("streamname").size()) { if (!config->getString("streamname").size()) {
if (config->getString("output") == "-") { if (config->getString("output") == "-") {
std::cerr << "Output to stdout not yet supported" << std::endl; std::cerr << "Output to stdout not yet supported" << std::endl;