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

Fixed track switching mid-stream, improved clarity of related debug messages

Browse source
This commit is contained in:
Thulinma 2020-10-16 16:47:06 +02:00
parent e7d802836a
commit 6276d03522
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/stream.cpp
View file

@ -1288,11 +1288,11 @@ std::set<size_t> Util::wouldSelect(const DTSC::Meta &M, const std::map<std::stri
if (it != result.begin()){selected << ", ";} if (it != result.begin()){selected << ", ";}
selected << *it; selected << *it;
} }
MEDIUM_MSG("Selected tracks: %s (%zu)", selected.str().c_str(), result.size()); MEDIUM_MSG("Would select tracks: %s (%zu)", selected.str().c_str(), result.size());
} }
if (!result.size() && validTracks.size() && capa["codecs"][bestSoFar].size()){ if (!result.size() && validTracks.size() && capa["codecs"][bestSoFar].size()){
WARN_MSG("No tracks selected (%zu total) for stream!", validTracks.size()); WARN_MSG("Would select no tracks (%zu total) for stream!", validTracks.size());
} }
return result; return result;
} }

6
src/output/output.cpp
View file

@ -445,6 +445,7 @@ namespace Mist{
} }
//Find elements in new selection but not in old selection //Find elements in new selection but not in old selection
diffs.clear();
std::set_difference(newSelects.begin(), newSelects.end(), oldSelects.begin(), oldSelects.end(), std::inserter(diffs, diffs.end())); std::set_difference(newSelects.begin(), newSelects.end(), oldSelects.begin(), oldSelects.end(), std::inserter(diffs, diffs.end()));
if (diffs.size()){MEDIUM_MSG("Adding %zu tracks", diffs.size());} if (diffs.size()){MEDIUM_MSG("Adding %zu tracks", diffs.size());}
for (std::set<size_t>::iterator it = diffs.begin(); it != diffs.end(); it++){ for (std::set<size_t>::iterator it = diffs.begin(); it != diffs.end(); it++){
@ -1236,7 +1237,10 @@ namespace Mist{
if (amount > 1000){amount = 1000;} if (amount > 1000){amount = 1000;}
Util::sleep(amount); Util::sleep(amount);
//Make sure we stay responsive to requests and stats while waiting //Make sure we stay responsive to requests and stats while waiting
if (wantRequest){requestHandler();} if (wantRequest){
requestHandler();
if (!realTime){break;}
}
stats(); stats();
} }
} }