From 2632343cc712188e0db2afa1e551e4a5086e70fa Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 10 May 2020 00:23:48 +0200 Subject: [PATCH] Remove scale to fit {width,height} options. --- src/lib/video_content.cc | 23 ----------------------- src/lib/video_content.h | 3 --- src/tools/dcpomatic.cc | 25 ------------------------- 3 files changed, 51 deletions(-) diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 685336367..9e8659b98 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -354,29 +354,6 @@ VideoContent::size_after_crop () const return crop().apply (size_after_3d_split ()); } -void -VideoContent::scale_and_crop_to_fit_width (shared_ptr film) -{ - set_scale (VideoContentScale(film->container())); - - int const crop = max (0, int (size().height - double (film->frame_size().height) * size().width / film->frame_size().width)); - set_left_crop (0); - set_right_crop (0); - set_top_crop (crop / 2); - set_bottom_crop (crop / 2); -} - -void -VideoContent::scale_and_crop_to_fit_height (shared_ptr film) -{ - set_scale (VideoContentScale(film->container())); - - int const crop = max (0, int (size().width - double (film->frame_size().width) * size().height / film->frame_size().height)); - set_left_crop (crop / 2); - set_right_crop (crop / 2); - set_top_crop (0); - set_bottom_crop (0); -} /** @param f Frame index within the whole (untrimmed) content. * @return Fade factor (between 0 and 1) or unset if there is no fade. diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 37223c457..9a7ad6dda 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -173,9 +173,6 @@ public: boost::optional fade (boost::shared_ptr film, Frame) const; - void scale_and_crop_to_fit_width (boost::shared_ptr film); - void scale_and_crop_to_fit_height (boost::shared_ptr film); - std::string processing_description (boost::shared_ptr film) const; void set_length (Frame); diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index f69ab5a6a..13569d11d 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -222,8 +222,6 @@ enum { ID_file_close = 100, ID_edit_copy, ID_edit_paste, - ID_content_scale_to_fit_width, - ID_content_scale_to_fit_height, ID_jobs_make_dcp, ID_jobs_make_dcp_batch, ID_jobs_make_kdms, @@ -316,8 +314,6 @@ public: Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_copy, this), ID_edit_copy); Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_paste, this), ID_edit_paste); Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES); - Bind (wxEVT_MENU, boost::bind (&DOMFrame::content_scale_to_fit_width, this), ID_content_scale_to_fit_width); - Bind (wxEVT_MENU, boost::bind (&DOMFrame::content_scale_to_fit_height, this), ID_content_scale_to_fit_height); Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dcp, this), ID_jobs_make_dcp); Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_kdms, this), ID_jobs_make_kdms); Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_make_dkdms, this), ID_jobs_make_dkdms); @@ -983,22 +979,6 @@ private: d->Destroy (); } - void content_scale_to_fit_width () - { - 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 (_film); - } - } - - void content_scale_to_fit_height () - { - 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 (_film); - } - } - void jobs_send_dcp_to_tms () { _film->send_dcp_to_tms (); @@ -1323,10 +1303,6 @@ private: add_item (edit, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS); #endif - wxMenu* content = new wxMenu; - add_item (content, _("Scale to fit &width"), ID_content_scale_to_fit_width, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT); - add_item (content, _("Scale to fit &height"), ID_content_scale_to_fit_height, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT); - wxMenu* jobs_menu = new wxMenu; add_item (jobs_menu, _("&Make DCP\tCtrl-M"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION); add_item (jobs_menu, _("Make DCP in &batch converter\tCtrl-B"), ID_jobs_make_dcp_batch, NEEDS_FILM | NOT_DURING_DCP_CREATION); @@ -1365,7 +1341,6 @@ private: m->Append (_file_menu, _("&File")); m->Append (edit, _("&Edit")); - m->Append (content, _("&Content")); m->Append (jobs_menu, _("&Jobs")); m->Append (view, _("&View")); m->Append (tools, _("&Tools")); -- 2.30.2