X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.h;h=dceb0effe833a4286ae05cf5b2c354716d0e5829;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=84daa71a56e0cd13a749471699d79ab5e0f27e1d;hpb=894d6e4cbfab5217adf6f39b1c097cec2a8f948c;p=dcpomatic.git

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 84daa71a5..dceb0effe 100644
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -18,57 +18,68 @@
 
 */
 
+
 #ifndef DCPOMATIC_CONTENT_MENU_H
 #define DCPOMATIC_CONTENT_MENU_H
 
+
 #include "timeline_content_view.h"
 #include "lib/types.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+DCPOMATIC_ENABLE_WARNINGS
+#include <memory>
 
+
+class DCPContent;
 class Film;
 class Job;
-class DCPContent;
 
-class ContentMenu : public boost::noncopyable
+
+class ContentMenu
 {
 public:
-	ContentMenu (wxWindow* p);
-	~ContentMenu ();
+	explicit ContentMenu (wxWindow* p);
 
-	void popup (boost::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint);
+	ContentMenu (ContentMenu const &) = delete;
+	ContentMenu& operator= (ContentMenu const &) = delete;
+
+	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 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 maybe_found_missing (std::weak_ptr<Job>, std::weak_ptr<Content>, std::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;
 	ContentList _content;
 	TimelineContentViewList _views;
 	wxMenuItem* _repeat;
 	wxMenuItem* _join;
 	wxMenuItem* _find_missing;
 	wxMenuItem* _properties;
+	wxMenuItem* _advanced;
 	wxMenuItem* _re_examine;
 	wxMenuItem* _kdm;
 	wxMenuItem* _ov;
 	wxMenuItem* _choose_cpl;
+	wxMenuItem* _set_dcp_settings;
 	wxMenuItem* _remove;
-
-	std::list<boost::signals2::connection> _job_connections;
 };
 
 #endif