summaryrefslogtreecommitdiff
path: root/src/tools/dcpomatic.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-11-21 12:15:26 +0000
committerCarl Hetherington <cth@carlh.net>2018-11-21 12:15:26 +0000
commitf67bc45820b4e56f90eecb97ba3b7762c119f9b5 (patch)
tree58b009c238bc4dad8606e70ba617bcb7a49fb89c /src/tools/dcpomatic.cc
parent84012cdd64f451891febd36154b7226ea21a899b (diff)
Add and use new FrameRateChange constructors.
Diffstat (limited to 'src/tools/dcpomatic.cc')
-rw-r--r--src/tools/dcpomatic.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 3d74859dc..15c4363ee 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -595,7 +595,7 @@ private:
{
ContentList const sel = _film_editor->content_panel()->selected();
DCPOMATIC_ASSERT (sel.size() == 1);
- _clipboard = sel.front()->clone();
+ _clipboard = sel.front()->clone(_film);
}
void edit_paste ()
@@ -873,7 +873,7 @@ private:
{
ContentList vc = _film_editor->content_panel()->selected_video ();
for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
- (*i)->video->scale_and_crop_to_fit_width ();
+ (*i)->video->scale_and_crop_to_fit_width (_film);
}
}
@@ -881,7 +881,7 @@ private:
{
ContentList vc = _film_editor->content_panel()->selected_video ();
for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
- (*i)->video->scale_and_crop_to_fit_height ();
+ (*i)->video->scale_and_crop_to_fit_height (_film);
}
}
@@ -1445,12 +1445,12 @@ private:
if (!_film_to_create.empty ()) {
_frame->new_film (_film_to_create, optional<string> ());
if (!_content_to_add.empty ()) {
- BOOST_FOREACH (shared_ptr<Content> i, content_factory (_frame->film(), _content_to_add)) {
+ BOOST_FOREACH (shared_ptr<Content> i, content_factory(_content_to_add)) {
_frame->film()->examine_and_add_content (i);
}
}
if (!_dcp_to_add.empty ()) {
- _frame->film()->examine_and_add_content (shared_ptr<DCPContent> (new DCPContent (_frame->film(), _dcp_to_add)));
+ _frame->film()->examine_and_add_content(shared_ptr<DCPContent>(new DCPContent(_dcp_to_add)));
}
}