From 5612f83db6a626cf5033bc197f442af8b438bc60 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 14 May 2013 10:53:25 +0200 Subject: [PATCH] Fixed VoD stream status resetting improperly. --- .gitignore | 1 + src/controller/controller_streams.cpp | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7215b2eb..21fbeb60 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.[oa] *.la *.lo +*.swp *~ .deps Makefile diff --git a/src/controller/controller_streams.cpp b/src/controller/controller_streams.cpp index 6c1e7edb..9179dded 100644 --- a/src/controller/controller_streams.cpp +++ b/src/controller/controller_streams.cpp @@ -60,8 +60,13 @@ namespace Controller { return; } cmd1 = "cat " + URL; - data["error"] = "Available"; - data["online"] = 2; + if (Util::epoch() - lastBuffer[name] > 5){ + data["error"] = "Available"; + data["online"] = 2; + }else{ + data["online"] = 1; + data.removeMember("error"); + } return; //MistPlayer handles VoD }else{ cmd1 = "ffmpeg -re -async 2 -i " + URL + " -f flv -";