From 46710d24468a762d669cd07a371479adc843bf40 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Thu, 21 Mar 2013 14:37:49 +0100 Subject: [PATCH] Moar DTSCFix fixes - also tweaked MistPlayer behaviour to prevent strange surprises. --- src/buffer/player.cpp | 5 ++--- src/converters/dtscfix.cpp | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/buffer/player.cpp b/src/buffer/player.cpp index 2c1169cd..c1e80b10 100644 --- a/src/buffer/player.cpp +++ b/src/buffer/player.cpp @@ -83,9 +83,8 @@ int main(int argc, char** argv){ while (Util::Procs::isActive("Fixer")){ Util::sleep(5000); } - std::cerr << "Done!" << std::endl; - source = DTSC::File(conf.getString("filename")); - meta = source.getMeta(); + std::cerr << "Done! Aborting this request to make sure all goes well." << std::endl; + return 1; } JSON::Value pausemark; diff --git a/src/converters/dtscfix.cpp b/src/converters/dtscfix.cpp index 107cdc04..fb0e2459 100644 --- a/src/converters/dtscfix.cpp +++ b/src/converters/dtscfix.cpp @@ -39,7 +39,9 @@ namespace Converters { F.seekNext(); while ( !F.getJSON().isNull()){ - nowpack = F.getJSON()["time"].asInt(); + if (F.getJSON()["time"].asInt() >= nowpack){ + nowpack = F.getJSON()["time"].asInt(); + } if ( !meta.isMember("firstms")){ meta["firstms"] = nowpack; }