Make use of new getTmpFolder() function in libmist

This commit is contained in:
Thulinma 2013-09-11 12:32:07 +02:00
parent f57a2a5e8a
commit b695ba6491
14 changed files with 20 additions and 18 deletions

View file

@ -291,7 +291,7 @@ namespace Connector_HTTP {
streamname = url.substr(7, url.length() - 10);
}
Util::Stream::sanitizeName(streamname);
JSON::Value ServConf = JSON::fromFile("/tmp/mist/streamlist");
JSON::Value ServConf = JSON::fromFile(Util::getTmpFolder() + "streamlist");
std::string response;
std::string host = H.GetHeader("Host");
if (host.find(':')){
@ -404,7 +404,7 @@ namespace Connector_HTTP {
delete connectorConnections[uid];
connectorConnections.erase(uid);
}
connectorConnections[uid] = new ConnConn(new Socket::Connection("/tmp/mist/" + connector));
connectorConnections[uid] = new ConnConn(new Socket::Connection(Util::getTmpFolder() + connector));
connectorConnections[uid]->conn->setBlocking(false); //do not block on spool() with no data
#if DEBUG >= 4
std::cout << "Created new connection " << uid << std::endl;

View file

@ -334,7 +334,7 @@ int main(int argc, char ** argv){
return -1;
}
Socket::Server server_socket = Socket::Server("/tmp/mist/http_dynamic");
Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
if ( !server_socket.connected()){
return 1;
}

View file

@ -207,7 +207,7 @@ int main(int argc, char ** argv){
return -1;
}
Socket::Server server_socket = Socket::Server("/tmp/mist/http_json");
Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
if ( !server_socket.connected()){
return 1;
}

View file

@ -352,7 +352,7 @@ int main(int argc, char ** argv){
return -1;
}
Socket::Server server_socket = Socket::Server("/tmp/mist/http_live");
Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
if ( !server_socket.connected()){
return 1;
}

View file

@ -212,7 +212,7 @@ int main(int argc, char ** argv){
return -1;
}
Socket::Server server_socket = Socket::Server("/tmp/mist/http_progressive_flv");
Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
if ( !server_socket.connected()){
return 1;
}

View file

@ -176,7 +176,7 @@ int main(int argc, char ** argv){
return -1;
}
Socket::Server server_socket = Socket::Server("/tmp/mist/http_progressive_mp3");
Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
if ( !server_socket.connected()){
return 1;
}

View file

@ -218,7 +218,7 @@ int main(int argc, char ** argv){
return -1;
}
Socket::Server server_socket = Socket::Server("/tmp/mist/http_progressive_mp4");
Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
if ( !server_socket.connected()){
return 1;
}

View file

@ -286,7 +286,7 @@ int main(int argc, char ** argv){
return -1;
}
Socket::Server server_socket = Socket::Server("/tmp/mist/http_progressive_ogg");
Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
if ( !server_socket.connected()){
return 1;
}

View file

@ -495,7 +495,7 @@ int main(int argc, char ** argv){
return -1;
}
Socket::Server server_socket = Socket::Server("/tmp/mist/http_smooth");
Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
if ( !server_socket.connected()){
return 1;
}

View file

@ -229,7 +229,7 @@ int main(int argc, char ** argv){
return -1;
}
Socket::Server server_socket = Socket::Server("/tmp/mist/http_srt");
Socket::Server server_socket = Socket::Server(Util::getTmpFolder() + capa["socket"].asStringRef());
if ( !server_socket.connected()){
return 1;
}