projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
s/use_template/take_settings_from/g
[dcpomatic.git]
/
src
/
lib
/
dcp_content.cc
diff --git
a/src/lib/dcp_content.cc
b/src/lib/dcp_content.cc
index fd092593514f76401699efcbbfe62b5f55c7817d..43d6911f57412d2f412623e36365fdaacad51f3b 100644
(file)
--- a/
src/lib/dcp_content.cc
+++ b/
src/lib/dcp_content.cc
@@
-531,7
+531,7
@@
DCPContent::can_reference_subtitle (list<string>& why_not) const
}
void
-DCPContent::
use_template
(shared_ptr<const Content> c)
+DCPContent::
take_settings_from
(shared_ptr<const Content> c)
{
shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (c);
DCPOMATIC_ASSERT (dc);