diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-23 17:18:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-23 17:18:49 +0100 |
| commit | 64a2f1bb6a7b972607fa363631ef7a47444e8217 (patch) | |
| tree | 020c028a93f113e372e70f485857ce04dea5db3d /src/lib/content.cc | |
| parent | 8c6fe8e1e8c8f6d5932606f2a5b6e1b87681ae38 (diff) | |
Various bits and pieces.
Diffstat (limited to 'src/lib/content.cc')
| -rw-r--r-- | src/lib/content.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index 43d0ef958..395359fa7 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -29,20 +29,23 @@ using std::string; using boost::shared_ptr; using boost::lexical_cast; -Content::Content (Time s) - : _start (s) +Content::Content (shared_ptr<const Film> f, Time s) + : _film (f) + , _start (s) { } -Content::Content (boost::filesystem::path f) - : _file (f) +Content::Content (shared_ptr<const Film> f, boost::filesystem::path p) + : _film (f) + , _file (p) , _start (0) { } -Content::Content (shared_ptr<const cxml::Node> node) +Content::Content (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node) + : _film (f) { _file = node->string_child ("File"); _digest = node->string_child ("Digest"); @@ -51,6 +54,7 @@ Content::Content (shared_ptr<const cxml::Node> node) Content::Content (Content const & o) : boost::enable_shared_from_this<Content> (o) + , _film (o._film) , _file (o._file) , _digest (o._digest) , _start (o._start) @@ -68,7 +72,7 @@ Content::as_xml (xmlpp::Node* node) const } void -Content::examine (shared_ptr<Film>, shared_ptr<Job>) +Content::examine (shared_ptr<Job>) { string const d = md5_digest (_file); boost::mutex::scoped_lock lm (_mutex); |