Work around deadlock when destroying J2KEncoder with a full writer queue (#2784).

[dcpomatic.git] / src / wx / content_menu.h

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index f2ad3aa75621ac04a114b46badd931b6bd92a4b1..2f32502848ba7e960faf89a7bec40915c5a7d9dd 100644 (file)
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -1,56 +1,97 @@
 /*
-    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 set_dcp_markers();
        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* _set_dcp_markers;
        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