From 851e9d3690f482948366d8b720b7dbee2d7eaa68 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 13 Aug 2012 20:06:33 +0100
Subject: Fix up some bugs with subs.

---
 src/dcp.cc      | 5 +++++
 src/dcp_time.cc | 4 ++++
 2 files changed, 9 insertions(+)

(limited to 'src')

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;
-- 
cgit v1.2.3