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

Added call to player with streamname.

Browse source
This commit is contained in:
Erik Zandvliet 2013-12-17 14:53:17 +01:00
parent 30e13972da
commit 1cf6e34745
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/stream.cpp
View file

@ -67,10 +67,10 @@ Socket::Connection Util::Stream::getLive(std::string streamname){
} }
/// Starts a process for a VoD stream. /// Starts a process for a VoD stream.
Socket::Connection Util::Stream::getVod(std::string filename){ Socket::Connection Util::Stream::getVod(std::string filename, std::string streamname){
std::string name = "MistPlayer " + filename; std::string name = "MistPlayer " + filename;
std::string player_bin = Util::getMyPath() + "MistPlayer"; std::string player_bin = Util::getMyPath() + "MistPlayer";
char* const argv[] = {(char*)player_bin.c_str(), (char*)filename.c_str(), NULL}; char* const argv[] = {(char*)player_bin.c_str(), (char*)filename.c_str(), "-s", (char*)streamname.c_str(), NULL};
int fdin = -1, fdout = -1, fderr = fileno(stderr); int fdin = -1, fdout = -1, fderr = fileno(stderr);
Util::Procs::StartPiped(name, argv, &fdin, &fdout, &fderr); Util::Procs::StartPiped(name, argv, &fdin, &fdout, &fderr);
// if StartPiped fails then fdin and fdout will be unmodified (-1) // if StartPiped fails then fdin and fdout will be unmodified (-1)
@ -86,7 +86,7 @@ Socket::Connection Util::Stream::getStream(std::string streamname){
#if DEBUG >= 5 #if DEBUG >= 5
std::cerr << "Opening VoD stream from file " << ServConf["streams"][streamname]["source"].asString() << std::endl; std::cerr << "Opening VoD stream from file " << ServConf["streams"][streamname]["source"].asString() << std::endl;
#endif #endif
return getVod(ServConf["streams"][streamname]["source"].asString()); return getVod(ServConf["streams"][streamname]["source"].asString(), streamname);
}else{ }else{
#if DEBUG >= 5 #if DEBUG >= 5
std::cerr << "Opening live stream " << streamname << std::endl; std::cerr << "Opening live stream " << streamname << std::endl;

2
lib/stream.h
View file

@ -11,7 +11,7 @@ namespace Util {
public: public:
static void sanitizeName(std::string & streamname); static void sanitizeName(std::string & streamname);
static Socket::Connection getLive(std::string streamname); static Socket::Connection getLive(std::string streamname);
static Socket::Connection getVod(std::string streamname); static Socket::Connection getVod(std::string filename, std::string streamname);
static Socket::Connection getStream(std::string streamname); static Socket::Connection getStream(std::string streamname);
static Socket::Server makeLive(std::string streamname); static Socket::Server makeLive(std::string streamname);
}; };