X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.h;h=783a5be04067c83ff524f2b35888eb8c1dc73e88;hb=62c03e3d3493df8a31361b3281c443cac35decb0;hp=7743d0712b7bb27008378ea60cac0c2977ab3601;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 7743d0712..783a5be04 100644
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -18,22 +18,34 @@
 
 */
 
+
 #ifndef DCPOMATIC_CONTENT_MENU_H
 #define DCPOMATIC_CONTENT_MENU_H
 
+
 #include "timeline_content_view.h"
 #include "lib/types.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <memory>
 
+
+class AutoCropDialog;
+class DCPContent;
 class Film;
+class FilmViewer;
 class Job;
-class DCPContent;
 
-class ContentMenu : public boost::noncopyable
+
+class ContentMenu
 {
 public:
-	explicit ContentMenu (wxWindow* p);
+	ContentMenu(wxWindow* parent, FilmViewer& viewer);
+
+	ContentMenu (ContentMenu const &) = delete;
+	ContentMenu& operator= (ContentMenu const &) = delete;
 
 	void popup (std::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint);
 
@@ -44,11 +56,11 @@ private:
 	void properties ();
 	void advanced ();
 	void re_examine ();
+	void auto_crop ();
 	void kdm ();
 	void ov ();
 	void set_dcp_settings ();
 	void remove ();
-	void maybe_found_missing (std::weak_ptr<Job>, std::weak_ptr<Content>, std::weak_ptr<Content>);
 	void cpl_selected (wxCommandEvent& ev);
 
 	wxMenu* _menu;
@@ -57,6 +69,7 @@ private:
 	std::weak_ptr<Film> _film;
 	wxWindow* _parent;
 	bool _pop_up_open;
+	FilmViewer& _viewer;
 	ContentList _content;
 	TimelineContentViewList _views;
 	wxMenuItem* _repeat;
@@ -65,11 +78,17 @@ private:
 	wxMenuItem* _properties;
 	wxMenuItem* _advanced;
 	wxMenuItem* _re_examine;
+	wxMenuItem* _auto_crop;
 	wxMenuItem* _kdm;
 	wxMenuItem* _ov;
 	wxMenuItem* _choose_cpl;
 	wxMenuItem* _set_dcp_settings;
 	wxMenuItem* _remove;
+
+	AutoCropDialog* _auto_crop_dialog = nullptr;
+	boost::signals2::scoped_connection _auto_crop_config_connection;
+	boost::signals2::scoped_connection _auto_crop_viewer_connection;
 };
 
+
 #endif