summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-08-13 20:06:33 +0100
committerCarl Hetherington <cth@carlh.net>2012-08-13 20:06:33 +0100
commit851e9d3690f482948366d8b720b7dbee2d7eaa68 (patch)
treed83f9b0931f2f36d4cd463c2b0d13b0786319da9 /src
parent9c1d9b7d6e8624e594d7fdf22ced0847741eb289 (diff)
Fix up some bugs with subs.
Diffstat (limited to 'src')
-rw-r--r--src/dcp.cc5
-rw-r--r--src/dcp_time.cc4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/dcp.cc b/src/dcp.cc
index 4112d3b6..c0438ebd 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -319,6 +319,11 @@ DCP::DCP (string directory)
)
));
}
+
+ for (list<string>::iterator i = files.subtitles.begin(); i != files.subtitles.end(); ++i) {
+ string const l = i->substr (_directory.length ());
+ _assets.push_back (shared_ptr<SubtitleAsset> (new SubtitleAsset (_directory, l)));
+ }
}
diff --git a/src/dcp_time.cc b/src/dcp_time.cc
index 5b4241c4..f853143a 100644
--- a/src/dcp_time.cc
+++ b/src/dcp_time.cc
@@ -25,6 +25,10 @@ using namespace std;
using namespace libdcp;
Time::Time (int frame, int frames_per_second)
+ : h (0)
+ , m (0)
+ , s (0)
+ , t (0)
{
float sec_float = float (frame) / frames_per_second;
t = (int (sec_float * 1000) % 1000) / 4;