diff --git a/aegisub/src/ass_time.cpp b/aegisub/src/ass_time.cpp index 7ea235f98..98cde4b16 100644 --- a/aegisub/src/ass_time.cpp +++ b/aegisub/src/ass_time.cpp @@ -119,8 +119,7 @@ void AssTime::ParseASS (const wxString text) { /// @return /// int AssTime::GetMS () const { - if (!UseMSPrecision) return time/10*10; - else return time; + return time / 10 * 10; } @@ -138,19 +137,17 @@ void AssTime::SetMS (int ms) { /// @return /// wxString AssTime::GetASSFormated (bool msPrecision) const { - int ms = time; - - // Centisecond precision - msPrecision = msPrecision || UseMSPrecision; - if (!msPrecision) ms = ms/10*10; + int ms = msPrecision ? time : GetMS(); int h = ms / (1000 * 60 * 60); int m = (ms / (1000 * 60)) % 60; int s = (ms / 1000) % 60; ms = ms % 1000; - if (msPrecision) return wxString::Format("%01i:%02i:%02i.%03i",h,m,s,ms); - else return wxString::Format("%01i:%02i:%02i.%02i",h,m,s,ms/10); + if (msPrecision) + return wxString::Format("%01i:%02i:%02i.%03i",h,m,s,ms); + else + return wxString::Format("%01i:%02i:%02i.%02i",h,m,s,ms/10); } /// @brief AssTime comparison @@ -220,12 +217,6 @@ AssTime operator - (const AssTime &t1, const AssTime &t2) { return AssTime(t1.GetMS() - t2.GetMS()); } - -/// DOCME -bool AssTime::UseMSPrecision = false; - - - /// @brief Get /// @return /// diff --git a/aegisub/src/ass_time.h b/aegisub/src/ass_time.h index 83a78f0a7..4f274c2d2 100644 --- a/aegisub/src/ass_time.h +++ b/aegisub/src/ass_time.h @@ -54,9 +54,6 @@ class AssTime { int time; public: - /// DOCME - static bool UseMSPrecision; - AssTime(); AssTime(int ms); diff --git a/aegisub/src/libresrc/default_config.json b/aegisub/src/libresrc/default_config.json index 263e9139f..46288c77a 100644 --- a/aegisub/src/libresrc/default_config.json +++ b/aegisub/src/libresrc/default_config.json @@ -12,7 +12,6 @@ "Local Config" : false, "Locale" : -1, "Maximized" : false, - "Nonstandard Milisecond Times" : false, "Save Charset" : "UTF-8", "Toolbar Icon Size" : 16 }, diff --git a/aegisub/src/main.cpp b/aegisub/src/main.cpp index fbdaa76ff..37ef361e2 100644 --- a/aegisub/src/main.cpp +++ b/aegisub/src/main.cpp @@ -61,7 +61,6 @@ #include "ass_dialogue.h" #include "ass_export_filter.h" #include "ass_file.h" -#include "ass_time.h" #include "audio_box.h" #include "auto4_base.h" #include "charset_conv.h" @@ -248,7 +247,6 @@ bool AegisubApp::OnInit() { StartupLog("Store options back"); OPT_SET("Version/Last Version")->SetInt(GetSVNRevision()); - AssTime::UseMSPrecision = OPT_GET("App/Nonstandard Milisecond Times")->GetBool(); StartupLog("Initialize final locale");