From 1cf6e347459e6e6ccd970b5b94b99882adf69172 Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Tue, 17 Dec 2013 14:53:17 +0100 Subject: [PATCH] Added call to player with streamname. --- lib/stream.cpp | 6 +++--- lib/stream.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/stream.cpp b/lib/stream.cpp index 588c3b42..af15740a 100644 --- a/lib/stream.cpp +++ b/lib/stream.cpp @@ -67,10 +67,10 @@ Socket::Connection Util::Stream::getLive(std::string streamname){ } /// 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 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); Util::Procs::StartPiped(name, argv, &fdin, &fdout, &fderr); // 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 std::cerr << "Opening VoD stream from file " << ServConf["streams"][streamname]["source"].asString() << std::endl; #endif - return getVod(ServConf["streams"][streamname]["source"].asString()); + return getVod(ServConf["streams"][streamname]["source"].asString(), streamname); }else{ #if DEBUG >= 5 std::cerr << "Opening live stream " << streamname << std::endl; diff --git a/lib/stream.h b/lib/stream.h index 2be8c92b..8037b367 100644 --- a/lib/stream.h +++ b/lib/stream.h @@ -11,7 +11,7 @@ namespace Util { public: static void sanitizeName(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::Server makeLive(std::string streamname); };