Ticket #3404: 3404_timeElapsed_v1.patch

source/ps/scripting/JSInterface_VisualReplay.cpp

@@ -1 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -48 +48 @@
 
 JS::Value JSI_VisualReplay::GetReplayMetadata(ScriptInterface::CxPrivate* pCxPrivate, const CStrW& directoryName)
 {
-    return VisualReplay::GetReplayMetadata(pCxPrivate, directoryName);
+    return VisualReplay::GetReplayMetadata(*(pCxPrivate->pScriptInterface), directoryName);
 }
 
 void JSI_VisualReplay::SaveReplayMetadata(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const CStrW& data)

source/ps/VisualReplay.cpp

@@ -238 +238 @@
         return JSVAL_NULL;
     }
 
-    int duration = getReplayDuration(replayStream, fileName, fileSize);
+    int duration = 0;
+    JS::RootedValue metadata(cx, GetReplayMetadata(scriptInterface, directory.string()));
+    if (!metadata.isNull())
+    {
+        JS::RootedObject metadataObject(cx, &metadata.toObject());
+        JS::RootedValue timeElapsed(cx);
+        JS_GetProperty(cx, metadataObject, "timeElapsed", &timeElapsed);
+        scriptInterface.FromJSVal(cx, timeElapsed, duration);
+        duration /= 1000;
+    }
+    if (!duration)
+        duration = getReplayDuration(replayStream, fileName, fileSize);
 
     SAFE_DELETE(replayStream);
 
@@ -321 +332 @@
     return fileInfo.Size() > 0;
 }
 
-JS::Value VisualReplay::GetReplayMetadata(ScriptInterface::CxPrivate* pCxPrivate, const CStrW& directoryName)
+JS::Value VisualReplay::GetReplayMetadata(ScriptInterface& scriptInterface, const CStrW& directoryName)
 {
     if (!HasReplayMetadata(directoryName))
         return JSVAL_NULL;
 
-    JSContext* cx = pCxPrivate->pScriptInterface->GetContext();
+    JSContext* cx = scriptInterface.GetContext();
     JSAutoRequest rq(cx);
     JS::RootedValue metadata(cx);
 
@@ -336 +347 @@
     std::getline(*stream, line);
     stream->close();
     SAFE_DELETE(stream);
-    pCxPrivate->pScriptInterface->ParseJSON(line, &metadata);
+    scriptInterface.ParseJSON(line, &metadata);
 
     return metadata;
 }

source/ps/VisualReplay.h

@@ -1 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -76 +76 @@
 /**
  * Returns the metadata of a replay.
  */
-JS::Value GetReplayMetadata(ScriptInterface::CxPrivate* pCxPrivate, const CStrW& directoryName);
+JS::Value GetReplayMetadata(ScriptInterface& scriptInterface, const CStrW& directoryName);
 
 /**
  * Saves the metadata from the session to metadata.json