X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.h;h=ebbdf5b60e254021165eaa54b53ad491fb21413b;hb=865316f0129c85cdd0248b87502fe97dec94b3f0;hp=43480888a5007ed306bc49f0468dd71fe1d01379;hpb=a3a38dcdab89d3c7fa21917ea7caec82d1586035;p=dcpomatic.git

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 43480888a..ebbdf5b60 100644
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -18,56 +18,77 @@
 
 */
 
+
 #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>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
+#include <memory>
+
 
+class AutoCropDialog;
+class DCPContent;
 class Film;
+class FilmViewer;
 class Job;
 
-class ContentMenu : public boost::noncopyable
+
+class ContentMenu
 {
 public:
-	ContentMenu (wxWindow* p);
-	~ContentMenu ();
+	ContentMenu (wxWindow* parent, std::weak_ptr<FilmViewer> viewer);
+
+	ContentMenu (ContentMenu const &) = delete;
+	ContentMenu& operator= (ContentMenu const &) = delete;
 
-	void popup (boost::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint);
+	void popup (std::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint);
 
 private:
 	void repeat ();
 	void join ();
 	void find_missing ();
 	void properties ();
+	void advanced ();
 	void re_examine ();
+	void auto_crop ();
 	void kdm ();
 	void ov ();
+	void set_dcp_settings ();
 	void remove ();
-	void maybe_found_missing (boost::weak_ptr<Job>, boost::weak_ptr<Content>, boost::weak_ptr<Content>);
 	void cpl_selected (wxCommandEvent& ev);
 
 	wxMenu* _menu;
 	wxMenu* _cpl_menu;
 	/** Film that we are working with; set up by popup() */
-	boost::weak_ptr<Film> _film;
+	std::weak_ptr<Film> _film;
 	wxWindow* _parent;
+	bool _pop_up_open;
+	std::weak_ptr<FilmViewer> _viewer;
 	ContentList _content;
 	TimelineContentViewList _views;
 	wxMenuItem* _repeat;
 	wxMenuItem* _join;
 	wxMenuItem* _find_missing;
 	wxMenuItem* _properties;
+	wxMenuItem* _advanced;
 	wxMenuItem* _re_examine;
+	wxMenuItem* _auto_crop;
 	wxMenuItem* _kdm;
 	wxMenuItem* _ov;
 	wxMenuItem* _choose_cpl;
+	wxMenuItem* _set_dcp_settings;
 	wxMenuItem* _remove;
 
-	boost::signals2::scoped_connection _job_connection;
+	AutoCropDialog* _auto_crop_dialog = nullptr;
+	boost::signals2::scoped_connection _auto_crop_config_connection;
+	boost::signals2::scoped_connection _auto_crop_viewer_connection;
 };
 
+
 #endif