X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.h;h=910afc7200f27a61d17e0a1930da8d7f12fc1b3c;hb=3c29aa6531a4046a8db72dcac81189eb8893233c;hp=054e3de3e10f1ace878312ebf63bee6563b56732;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 054e3de3e..910afc720 100644
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -1,67 +1,85 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #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 DCPContent;
 class Film;
 class Job;
 
-class ContentMenu : public boost::noncopyable
+
+class ContentMenu
 {
 public:
-	ContentMenu (wxWindow* p);
-	~ContentMenu ();
+	explicit ContentMenu (wxWindow* p);
+
+	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 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;
-
-	boost::signals2::scoped_connection _job_connection;
 };
 
 #endif