projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove Film pointer from clone().
[dcpomatic.git]
/
src
/
lib
/
content.cc
diff --git
a/src/lib/content.cc
b/src/lib/content.cc
index 5139eb4cc57557a828dc14f58da879baa573cec4..11bf63f11eb1c8e0761bd8d9491ab2076e61ff2c 100644
(file)
--- a/
src/lib/content.cc
+++ b/
src/lib/content.cc
@@
-270,7
+270,7
@@
Content::set_trim_end (ContentTime t)
shared_ptr<Content>
shared_ptr<Content>
-Content::clone (
shared_ptr<const Film> film
) const
+Content::clone () const
{
/* This is a bit naughty, but I can't think of a compelling reason not to do it ... */
xmlpp::Document doc;
{
/* This is a bit naughty, but I can't think of a compelling reason not to do it ... */
xmlpp::Document doc;
@@
-279,7
+279,7
@@
Content::clone (shared_ptr<const Film> film) const
/* notes is unused here (we assume) */
list<string> notes;
/* notes is unused here (we assume) */
list<string> notes;
- return content_factory (
film,
cxml::NodePtr(new cxml::Node(node)), Film::current_state_version, notes);
+ return content_factory (cxml::NodePtr(new cxml::Node(node)), Film::current_state_version, notes);
}
string
}
string