mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity
Aegisub/aegisub/src/ass_time.cpp

116 lines
3.5 KiB
C++
Raw Normal View History

Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
// Copyright (c) 2013, Thomas Goyne <plorkyeran@aegisub.org>
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
//
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
// Permission to use, copy, modify, and distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
// copyright notice and this permission notice appear in all copies.
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
//
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
//
Switch all headers to using Doxygen and cleanup contact info * Swap old email + website address with 'Aegisub Project http://www.aegisub.org/' * Set categories for all files (jfs) * Add descriptions for each file (jfs) * Add $Id$ keyword Originally committed to SVN as r3310.
2009-07-29 07:43:02 +02:00
// Aegisub Project http://www.aegisub.org/
/// @file ass_time.cpp
/// @brief Class for managing timestamps in subtitles
/// @ingroup subs_storage
///
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Add config.h to 8 files that were missing it, _all_ source files must include config.h at the very top. Originally committed to SVN as r3666.
2009-10-09 18:34:38 +02:00
#include "config.h"
Uncrustify AssTime Originally committed to SVN as r6122.
2011-12-22 22:28:41 +01:00
#include "ass_time.h"
Fix all the headers in *.cpp, this includes: * Wrapping all headers that are in agi_pre.h with AGI_PRE. * Sorting alphabetically. Originally committed to SVN as r3515.
2009-09-10 15:06:40 +02:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
#include "utils.h"
Rewrite SMPTE timecode handling Move SMPTE handling to agi::vfr::Framerate to get all of the interesting logic dealing with timcodes in one place, and to make it testable. Completely rewrite the SMPTE time conversions as testing them reveals that they were incorrect in some cases. Originally committed to SVN as r6631.
2012-03-29 21:04:36 +02:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
#include <libaegisub/util.h>
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
#include <algorithm>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
#include <boost/format.hpp>
#include <boost/range/adaptor/filtered.hpp>
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Overload operator int() on AssTime and remove GetMS/SetMS Originally committed to SVN as r6123.
2011-12-22 22:28:51 +01:00
AssTime::AssTime(int time) : time(mid(0, time, 10 * 60 * 60 * 1000 - 1)) { }
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
AssTime::AssTime(std::string const& text)
Make AssTime::ParseASS a constructor overload instead Originally committed to SVN as r6468.
2012-02-14 01:35:06 +01:00
: time(0)
{
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
int after_decimal = -1;
int current = 0;
Allow using , as the separator in time edit controls
2013-10-08 16:19:56 +02:00
for (char c : text | boost::adaptors::filtered(boost::is_any_of(",.0123456789:"))) {
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
if (c == ':') {
time = time * 60 + current;
current = 0;
}
Allow using , as the separator in time edit controls
2013-10-08 16:19:56 +02:00
else if (c == '.' || c == ',') {
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
time = (time * 60 + current) * 1000;
current = 0;
after_decimal = 100;
}
else if (after_decimal < 0) {
current *= 10;
current += c - '0';
}
else {
time += (c - '0') * after_decimal;
after_decimal /= 10;
}
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
// Never saw a decimal, so convert now to ms
if (after_decimal < 0)
time = (time * 60 + current) * 1000;
Apply bounds checking to AssTimes generated from strings Originally committed to SVN as r6564.
2012-03-12 00:04:56 +01:00
// Limit to the valid range
time = mid(0, time, 10 * 60 * 60 * 1000 - 1);
AssTime changed to store data as miliseconds internally (overall faster, uses less ram) Originally committed to SVN as r100.
2006-02-21 23:09:15 +01:00
}
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
std::string AssTime::GetAssFormated(bool msPrecision) const {
std::string ret(10 + msPrecision, ':');
ret[0] = '0' + GetTimeHours();
ret[2] = '0' + (time % (60 * 60 * 1000)) / (60 * 1000 * 10);
ret[3] = '0' + (time % (10 * 60 * 1000)) / (60 * 1000);
ret[5] = '0' + (time % (60 * 1000)) / (1000 * 10);
ret[6] = '0' + (time % (10 * 1000)) / 1000;
ret[7] = '.';
ret[8] = '0' + (time % 1000) / 100;
ret[9] = '0' + (time % 100) / 10;
if (msPrecision)
ret[10] = '0' + time % 10;
return ret;
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Uncrustify AssTime Originally committed to SVN as r6122.
2011-12-22 22:28:41 +01:00
int AssTime::GetTimeHours() const { return time / 3600000; }
int AssTime::GetTimeMinutes() const { return (time % 3600000) / 60000; }
int AssTime::GetTimeSeconds() const { return (time % 60000) / 1000; }
int AssTime::GetTimeMiliseconds() const { return (time % 1000); }
int AssTime::GetTimeCentiseconds() const { return (time % 1000) / 10; }
Move the SMPTE timecode stuff out of the AssTime class and put it in a class of its own, FractionalTime. The AssTime to SMPTE part is tested and verified to work (in fact it looks like I unintentionally fixed an overlap bug in the TranStation export filter), while the SMPTE to AssTime part is completely untested (but it's currently not used anywhere so it's not like it matters). Originally committed to SVN as r2909.
2009-05-10 05:50:58 +02:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
SmpteFormatter::SmpteFormatter(agi::vfr::Framerate fps, std::string const& sep)
Use agi::vfr::Framerate in FractionalTime rather than a numerator\denominator pair Originally committed to SVN as r6119.
2011-12-22 22:28:13 +01:00
: fps(fps)
Rewrite SMPTE timecode handling Move SMPTE handling to agi::vfr::Framerate to get all of the interesting logic dealing with timcodes in one place, and to make it testable. Completely rewrite the SMPTE time conversions as testing them reveals that they were incorrect in some cases. Originally committed to SVN as r6631.
2012-03-29 21:04:36 +02:00
, sep(sep)
Make FractionalTime less weird Originally committed to SVN as r6086.
2011-12-22 22:22:49 +01:00
{
Move the SMPTE timecode stuff out of the AssTime class and put it in a class of its own, FractionalTime. The AssTime to SMPTE part is tested and verified to work (in fact it looks like I unintentionally fixed an overlap bug in the TranStation export filter), while the SMPTE to AssTime part is completely untested (but it's currently not used anywhere so it's not like it matters). Originally committed to SVN as r2909.
2009-05-10 05:50:58 +02:00
}
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
std::string SmpteFormatter::ToSMPTE(AssTime time) const {
Rewrite SMPTE timecode handling Move SMPTE handling to agi::vfr::Framerate to get all of the interesting logic dealing with timcodes in one place, and to make it testable. Completely rewrite the SMPTE time conversions as testing them reveals that they were incorrect in some cases. Originally committed to SVN as r6631.
2012-03-29 21:04:36 +02:00
int h=0, m=0, s=0, f=0;
fps.SmpteAtTime(time, &h, &m, &s, &f);
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
return str(boost::format("%02d%s%02d%s%02d%c%02d") % h % sep % m % sep % s % sep % f);
Rewrite SMPTE timecode handling Move SMPTE handling to agi::vfr::Framerate to get all of the interesting logic dealing with timcodes in one place, and to make it testable. Completely rewrite the SMPTE time conversions as testing them reveals that they were incorrect in some cases. Originally committed to SVN as r6631.
2012-03-29 21:04:36 +02:00
}
- Reworked the SMPTE timecode handling with Plorkyeran's help. It does now handle dropframe timecodes as well; the ms->SMPTE handling has been tested and seems reasonably correct, while the reverse conversion remains untested and unused. The Adobe Encore export filter will now use dropframe timecodes properly (previously it would play pretend with wallclock hours/minutes/seconds and incorrect frame numbers). - Changed the SubtitleFormat::AskForFPS dialog box; removed the "PAL/NTSC only" choice and added a "show SMPTE dropframe" parameter instead. Also added 50fps as a choice. - While I was at it, reworked the TranStation export filter so it actually looks ahead to see if the next line will overlap with the current, and if so, move the end time of the current line backwards one frame, which fixes #767 Originally committed to SVN as r2920.
2009-05-13 22:24:21 +02:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
AssTime SmpteFormatter::FromSMPTE(std::string const& str) const {
std::vector<std::string> toks;
boost::split(toks, str, boost::is_any_of(sep));
Rewrite SMPTE timecode handling Move SMPTE handling to agi::vfr::Framerate to get all of the interesting logic dealing with timcodes in one place, and to make it testable. Completely rewrite the SMPTE time conversions as testing them reveals that they were incorrect in some cases. Originally committed to SVN as r6631.
2012-03-29 21:04:36 +02:00
if (toks.size() != 4) return 0;
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
int h, m, s, f;
agi::util::try_parse(toks[0], &h);
agi::util::try_parse(toks[1], &m);
agi::util::try_parse(toks[2], &s);
agi::util::try_parse(toks[3], &f);
Rewrite SMPTE timecode handling Move SMPTE handling to agi::vfr::Framerate to get all of the interesting logic dealing with timcodes in one place, and to make it testable. Completely rewrite the SMPTE time conversions as testing them reveals that they were incorrect in some cases. Originally committed to SVN as r6631.
2012-03-29 21:04:36 +02:00
return fps.TimeAtSmpte(h, m, s, f);
Move the SMPTE timecode stuff out of the AssTime class and put it in a class of its own, FractionalTime. The AssTime to SMPTE part is tested and verified to work (in fact it looks like I unintentionally fixed an overlap bug in the TranStation export filter), while the SMPTE to AssTime part is completely untested (but it's currently not used anywhere so it's not like it matters). Originally committed to SVN as r2909.
2009-05-10 05:50:58 +02:00
}
Copy permalink