Fix merge.

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

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 9aaf9d59fc075beb7eb476ac2aa50cd19f393618..84daa71a56e0cd13a749471699d79ab5e0f27e1d 100644 (file)
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -29,6 +29,7 @@
 
 class Film;
 class Job;
+class DCPContent;
 
 class ContentMenu : public boost::noncopyable
 {
@@ -48,8 +49,10 @@ private:
        void ov ();
        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;
        wxWindow* _parent;
@@ -62,9 +65,10 @@ private:
        wxMenuItem* _re_examine;
        wxMenuItem* _kdm;
        wxMenuItem* _ov;
+       wxMenuItem* _choose_cpl;
        wxMenuItem* _remove;
 
-       boost::signals2::scoped_connection _job_connection;
+       std::list<boost::signals2::connection> _job_connections;
 };
 
 #endif