projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 1.0-seek and subtitle-content.
[dcpomatic.git]
/
src
/
lib
/
subrip.cc
diff --git
a/src/lib/subrip.cc
b/src/lib/subrip.cc
index be2c6f666b269e9c9f0bd933093735d19cafecad..380a2ce2cb7e7757c2e1fc7472f571d72aa0a693 100644
(file)
--- a/
src/lib/subrip.cc
+++ b/
src/lib/subrip.cc
@@
-123,10
+123,10
@@
SubRip::SubRip (shared_ptr<const SubRipContent> content)
fclose (f);
}
fclose (f);
}
-Time
+
Content
Time
SubRip::convert_time (string t)
{
SubRip::convert_time (string t)
{
- Time r = 0;
+
Content
Time r = 0;
vector<string> a;
boost::algorithm::split (a, t, boost::is_any_of (":"));
vector<string> a;
boost::algorithm::split (a, t, boost::is_any_of (":"));
@@
-225,7
+225,7
@@
SubRip::convert_content (list<string> t)
return pieces;
}
return pieces;
}
-Time
+
Content
Time
SubRip::length () const
{
if (_subtitles.empty ()) {
SubRip::length () const
{
if (_subtitles.empty ()) {