X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.h;h=c750ae852d982c6f327cee7fbafc4f0dc4b17f53;hb=732ce79ef10c58c129a8b9822fad9955a97a153d;hp=fccd5f38a4b714070f7c2db7f6f4822be446313c;hpb=cb1dfa9ec09af2abf6d10e4bf2764476db83841b;p=dcpomatic.git

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index fccd5f38a..c750ae852 100644
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -1,58 +1,95 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    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 <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+
+#include "auto_crop_dialog.h"
+#include "timeline_content_view.h"
+#include "wx_ptr.h"
 #include "lib/types.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+#include <memory>
+
 
+class DCPContent;
 class Film;
+class FilmViewer;
+class Job;
+
 
 class ContentMenu
 {
 public:
-	ContentMenu (wxWindow* p);
-	~ContentMenu ();
-	
-	void popup (boost::weak_ptr<Film>, ContentList, wxPoint);
+	ContentMenu(wxWindow* parent, FilmViewer& viewer);
+
+	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 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;
+	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;
+
+	wx_ptr<AutoCropDialog> _auto_crop_dialog;
+	boost::signals2::scoped_connection _auto_crop_config_connection;
+	boost::signals2::scoped_connection _auto_crop_viewer_connection;
 };
 
+
 #endif