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

Some static/non-static fixes to procs/stream library, updated converter to make use of getOutputOf function instead of re-implementing this.

Browse source
This commit is contained in:
Thulinma 2013-08-27 00:29:04 +02:00
parent d7e9029609
commit 6675b647b8
4 changed files with 10 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/stream.cpp
View file

@ -39,9 +39,9 @@ Socket::Connection Util::Stream::getLive(std::string streamname){
Socket::Connection Util::Stream::getVod(std::string filename){
std::string name = "MistPlayer " + filename;
std::string player_bin = Util::getMyPath() + "MistPlayer";
const char *argv[] = {player_bin.c_str(), filename.c_str(), NULL};
char* const argv[] = {(char*)player_bin.c_str(), (char*)filename.c_str(), NULL};
int fdin = -1, fdout = -1, fderr = fileno(stderr);
Util::Procs::StartPiped(name, (char **)argv, &fdin, &fdout, &fderr);
Util::Procs::StartPiped(name, argv, &fdin, &fdout, &fderr);
// if StartPiped fails then fdin and fdout will be unmodified (-1)
return Socket::Connection(fdin, fdout);
}