From f18dc5d85e88f1a8006f5ad6d30b436a1b70dddc Mon Sep 17 00:00:00 2001 From: Thulinma Date: Thu, 21 Mar 2013 14:56:17 +0100 Subject: [PATCH] Fixes a few minor errors in MistPlayer. --- src/buffer/player.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/buffer/player.cpp b/src/buffer/player.cpp index c1e80b10..80859619 100644 --- a/src/buffer/player.cpp +++ b/src/buffer/player.cpp @@ -75,7 +75,11 @@ int main(int argc, char** argv){ DTSC::File source = DTSC::File(conf.getString("filename")); JSON::Value meta = source.getMeta(); - + + //send the header + std::string meta_str = meta.toNetPacked(); + in_out.Send(meta_str); + if ( !(meta.isMember("keytime") && meta.isMember("keybpos") && meta.isMember("keynum") && meta.isMember("keylen") && meta.isMember("frags")) && meta.isMember("video")){ //file needs to be DTSCFix'ed! Run MistDTSCFix executable on it first std::cerr << "Calculating / writing / updating VoD metadata..." << std::endl; @@ -94,12 +98,6 @@ int main(int argc, char** argv){ Socket::Connection StatsSocket = Socket::Connection("/tmp/mist/statistics", true); int lasttime = Util::epoch(); //time last packet was sent - //send the header - std::string meta_str = meta.toNetPacked(); - in_out.Send(meta_str); - - if (meta.isMember("keytime")) - if (meta["video"]["keyms"].asInt() < 11){ meta["video"]["keyms"] = (long long int)1000; }