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

Clearer semaphore error messages, removed some legacy code, fixed a compile warning or two.

Browse source
This commit is contained in:
Thulinma 2014-06-20 10:36:26 +02:00
parent e090a9368d
commit 43078c5c68
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/mp4.cpp
View file

@ -101,7 +101,7 @@ namespace MP4 {
} else if (size == 0) { } else if (size == 0) {
fseek(newData, 0, SEEK_END); fseek(newData, 0, SEEK_END);
} }
DEBUG_MSG(DLVL_DEVEL, "skipping size 0x%0.8X", size); DEBUG_MSG(DLVL_DEVEL, "skipping size 0x%0.8lX", size);
if (fseek(newData, pos + size, SEEK_SET) == 0) { if (fseek(newData, pos + size, SEEK_SET) == 0) {
return true; return true;
} else { } else {

4
lib/shared_memory.cpp
View file

@ -812,7 +812,7 @@ namespace IPC {
mySemaphore.open(std::string("/" + baseName).c_str(), O_RDWR); mySemaphore.open(std::string("/" + baseName).c_str(), O_RDWR);
#endif #endif
if (!mySemaphore) { if (!mySemaphore) {
DEBUG_MSG(DLVL_FAIL, "Creating semaphore failed: %s", strerror(errno)); DEBUG_MSG(DLVL_FAIL, "Creating copy of semaphore %s failed: %s", baseName.c_str(), strerror(errno));
return; return;
} }
semGuard tmpGuard(mySemaphore); semGuard tmpGuard(mySemaphore);
@ -832,7 +832,7 @@ namespace IPC {
mySemaphore.open(std::string("/" + baseName).c_str(), O_RDWR); mySemaphore.open(std::string("/" + baseName).c_str(), O_RDWR);
#endif #endif
if (!mySemaphore) { if (!mySemaphore) {
DEBUG_MSG(DLVL_FAIL, "Creating semaphore failed: %s", strerror(errno)); DEBUG_MSG(DLVL_FAIL, "Creating semaphore %s failed: %s", baseName.c_str(), strerror(errno));
return; return;
} }
semGuard tmpGuard(mySemaphore); semGuard tmpGuard(mySemaphore);

3
lib/stream.cpp
View file

@ -63,9 +63,7 @@ void Util::Stream::sanitizeName(std::string & streamname) {
bool Util::Stream::getLive(std::string streamname) { bool Util::Stream::getLive(std::string streamname) {
JSON::Value ServConf = JSON::fromFile(getTmpFolder() + "streamlist"); JSON::Value ServConf = JSON::fromFile(getTmpFolder() + "streamlist");
static unsigned long long counter = 0;
std::stringstream name; std::stringstream name;
name << "MistInBuffer " << (counter++);
std::string player_bin = Util::getMyPath() + "MistInBuffer"; std::string player_bin = Util::getMyPath() + "MistInBuffer";
DEBUG_MSG(DLVL_WARN, "Starting %s -p -s %s", player_bin.c_str(), streamname.c_str()); DEBUG_MSG(DLVL_WARN, "Starting %s -p -s %s", player_bin.c_str(), streamname.c_str());
char * argv[15] = {(char *)player_bin.c_str(), (char *)"-p", (char *)"-s", (char *)streamname.c_str(), (char *)0}; char * argv[15] = {(char *)player_bin.c_str(), (char *)"-p", (char *)"-s", (char *)streamname.c_str(), (char *)0};
@ -89,7 +87,6 @@ bool Util::Stream::getLive(std::string streamname) {
/// Starts a process for a VoD stream. /// Starts a process for a VoD stream.
bool Util::Stream::getVod(std::string filename, std::string streamname) { bool Util::Stream::getVod(std::string filename, std::string streamname) {
static unsigned long long counter = 0;
std::string player_bin = Util::getMyPath() + "MistInDTSC"; std::string player_bin = Util::getMyPath() + "MistInDTSC";
bool selected = false; bool selected = false;
if (filename.substr(filename.size() - 5) == ".dtsc") { if (filename.substr(filename.size() - 5) == ".dtsc") {