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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2015-07-22 09:53:46 +02:00
commit 232fc9ff0a
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/input/input.cpp
View file

@ -346,7 +346,7 @@ namespace Mist {
return false; return false;
} }
//Update keynum to point to the corresponding page //Update keynum to point to the corresponding page
INFO_MSG("Updating keynum %u to %lu", keyNum, (--(pagesByTrack[track].upper_bound(keyNum)))->first); INFO_MSG("Loading key %u from page %lu", keyNum, (--(pagesByTrack[track].upper_bound(keyNum)))->first);
keyNum = (--(pagesByTrack[track].upper_bound(keyNum)))->first; keyNum = (--(pagesByTrack[track].upper_bound(keyNum)))->first;
if (!bufferStart(track, keyNum)){ if (!bufferStart(track, keyNum)){
WARN_MSG("bufferStart failed! Cancelling bufferFrame", track); WARN_MSG("bufferStart failed! Cancelling bufferFrame", track);

8
src/io.cpp
View file

@ -112,7 +112,7 @@ namespace Mist {
} }
} }
INFO_MSG("Start buffering page %lu on track %lu~>%lu successful", pageNumber, tid, mapTid); HIGH_MSG("Start buffering page %lu on track %lu~>%lu successful", pageNumber, tid, mapTid);
///\return true if everything was successful ///\return true if everything was successful
return true; return true;
} }
@ -304,9 +304,9 @@ namespace Mist {
//Print a message about registering the page or not. //Print a message about registering the page or not.
if (!inserted) { if (!inserted) {
INFO_MSG("Can't register page %lu on the metaPage of track %lu~>%lu, No empty spots left within 'should be' amount of slots", curPageNum[tid], tid, mapTid); FAIL_MSG("Can't register page %lu on the metaPage of track %lu~>%lu, No empty spots left within 'should be' amount of slots", curPageNum[tid], tid, mapTid);
} else { } else {
INFO_MSG("Succesfully registered page %lu on the metaPage of track %lu~>%lu.", curPageNum[tid], tid, mapTid); HIGH_MSG("Succesfully registered page %lu on the metaPage of track %lu~>%lu.", curPageNum[tid], tid, mapTid);
} }
//Close our link to the page. This will NOT destroy the shared page, as we've set master to false upon construction //Close our link to the page. This will NOT destroy the shared page, as we've set master to false upon construction
#if defined(__CYGWIN__) || defined(_WIN32) #if defined(__CYGWIN__) || defined(_WIN32)
@ -430,7 +430,7 @@ namespace Mist {
userClient.keepAlive(); userClient.keepAlive();
if (trackMap.count(tid) && !trackState.count(tid)) { if (trackMap.count(tid) && !trackState.count(tid)) {
//If the trackmap has been set manually, don't negotiate //If the trackmap has been set manually, don't negotiate
INFO_MSG("Manually Set TrackMap"); HIGH_MSG("TrackMap manual, not negotiating track IDs");
trackState[tid] = FILL_ACC; trackState[tid] = FILL_ACC;
char pageName[NAME_BUFFER_SIZE]; char pageName[NAME_BUFFER_SIZE];
snprintf(pageName, NAME_BUFFER_SIZE, SHM_TRACK_INDEX, streamName.c_str(), tid); snprintf(pageName, NAME_BUFFER_SIZE, SHM_TRACK_INDEX, streamName.c_str(), tid);

6
src/output/output.cpp
View file

@ -133,7 +133,13 @@ namespace Mist {
onFail(); onFail();
return; return;
} }
if (statsPage.getData()){
statsPage.finish();
}
statsPage = IPC::sharedClient(SHM_STATISTICS, STAT_EX_SIZE, true); statsPage = IPC::sharedClient(SHM_STATISTICS, STAT_EX_SIZE, true);
if (userClient.getData()){
userClient.finish();
}
char userPageName[NAME_BUFFER_SIZE]; char userPageName[NAME_BUFFER_SIZE];
snprintf(userPageName, NAME_BUFFER_SIZE, SHM_USERS, streamName.c_str()); snprintf(userPageName, NAME_BUFFER_SIZE, SHM_USERS, streamName.c_str());
userClient = IPC::sharedClient(userPageName, PLAY_EX_SIZE, true); userClient = IPC::sharedClient(userPageName, PLAY_EX_SIZE, true);