From 7f8aecd7fab0daadc9e8f2a8df30a61e0304190d Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sat, 10 Mar 2012 01:00:13 +0000 Subject: [PATCH] Use int64_t for progress reporting rather than int as it's what ffms2 requires. Fixes magic jumping progress bars during indexing. Originally committed to SVN as r6556. --- aegisub/libaegisub/include/libaegisub/background_runner.h | 4 +++- aegisub/src/auto4_base.h | 2 +- aegisub/src/dialog_progress.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/aegisub/libaegisub/include/libaegisub/background_runner.h b/aegisub/libaegisub/include/libaegisub/background_runner.h index 09f374f55..7ae72e886 100644 --- a/aegisub/libaegisub/include/libaegisub/background_runner.h +++ b/aegisub/libaegisub/include/libaegisub/background_runner.h @@ -21,7 +21,9 @@ #pragma once #ifndef LAGI_PRE +#include #include + #ifdef _WIN32 #include #else @@ -49,7 +51,7 @@ namespace agi { /// Set an additional message associated with the task virtual void SetMessage(std::string const& msg)=0; /// Set the current task progress - virtual void SetProgress(int cur, int max)=0; + virtual void SetProgress(int64_t cur, int64_t max)=0; /// @brief Log a message /// diff --git a/aegisub/src/auto4_base.h b/aegisub/src/auto4_base.h index fb74a035c..6fa3a3d65 100644 --- a/aegisub/src/auto4_base.h +++ b/aegisub/src/auto4_base.h @@ -148,7 +148,7 @@ namespace Automation4 { void SetIndeterminate() { impl->SetIndeterminate(); } void SetTitle(std::string const& title) { impl->SetTitle(title); } void SetMessage(std::string const& msg) { impl->SetMessage(msg); } - void SetProgress(int cur, int max) { impl->SetProgress(cur, max); } + void SetProgress(int64_t cur, int64_t max) { impl->SetProgress(cur, max); } void Log(std::string const& str) { impl->Log(str); } bool IsCancelled() { return impl->IsCancelled(); } diff --git a/aegisub/src/dialog_progress.cpp b/aegisub/src/dialog_progress.cpp index 5ffc49b10..649e92c36 100644 --- a/aegisub/src/dialog_progress.cpp +++ b/aegisub/src/dialog_progress.cpp @@ -70,7 +70,7 @@ public: SafeQueue(EVT_MESSAGE, lagi_wxString(msg)); } - void SetProgress(int cur, int max) { + void SetProgress(int64_t cur, int64_t max) { SafeQueue(EVT_PROGRESS, int(double(cur) / max * 100)); }