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

le fixes by me, all me none of it was Erik

Browse source
This commit is contained in:
Balder 2017-05-11 16:34:30 +02:00 • committed by Thulinma
parent 2db54b38fc
commit 6811b54186
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/input/input_hls.cpp
View file

@ -41,6 +41,7 @@ namespace Mist {
initDone = false; initDone = false;
lastTimestamp = 0; lastTimestamp = 0;
uri = uriSrc; uri = uriSrc;
startTime = Util::bootSecs();
if (uri.size()){ if (uri.size()){
std::string line; std::string line;
@ -628,7 +629,7 @@ namespace Mist {
thisPacket.null(); thisPacket.null();
while (!hasPacket && config->is_active) { while (!hasPacket && config->is_active && nProxy.userClient.isAlive()) {
if (playlists[currentPlaylist].isUrl()) { if (playlists[currentPlaylist].isUrl()) {
endOfFile = playlists[currentPlaylist].atEnd(); endOfFile = playlists[currentPlaylist].atEnd();
@ -675,7 +676,7 @@ namespace Mist {
int playlistTime = reloadNext.at(currentPlaylist) - Util::bootSecs() - 1; int playlistTime = reloadNext.at(currentPlaylist) - Util::bootSecs() - 1;
if (playlistTime < segmentTime) { if (playlistTime < segmentTime) {
while (playlistTime > 0) { while (playlistTime > 0 && nProxy.userClient.isAlive()) {
Util::wait(900); Util::wait(900);
nProxy.userClient.keepAlive(); nProxy.userClient.keepAlive();
playlistTime--; playlistTime--;
@ -1004,7 +1005,7 @@ namespace Mist {
int segmentTime = playlists[pListId].entries.front().timestamp - Util::bootSecs(); int segmentTime = playlists[pListId].entries.front().timestamp - Util::bootSecs();
if (segmentTime){ if (segmentTime){
--segmentTime; --segmentTime;
while (segmentTime > 1) { while (segmentTime > 1 && nProxy.userClient.isAlive()) {
Util::wait(1000); Util::wait(1000);
--segmentTime; --segmentTime;
continueNegotiate(); continueNegotiate();