projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidying.
[dcpomatic.git]
/
src
/
wx
/
content_menu.h
diff --git
a/src/wx/content_menu.h
b/src/wx/content_menu.h
index 0647331038b64d00477ca0e293abcf793d81a864..240a9e64f9be2c18da7daa99fe6135f6e83f735f 100644
(file)
--- a/
src/wx/content_menu.h
+++ b/
src/wx/content_menu.h
@@
-18,42
+18,50
@@
*/
*/
+
#ifndef DCPOMATIC_CONTENT_MENU_H
#define DCPOMATIC_CONTENT_MENU_H
#ifndef DCPOMATIC_CONTENT_MENU_H
#define DCPOMATIC_CONTENT_MENU_H
+
#include "timeline_content_view.h"
#include "lib/types.h"
#include <wx/wx.h>
#include "timeline_content_view.h"
#include "lib/types.h"
#include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
+
+class DCPContent;
class Film;
class Job;
class Film;
class Job;
-class DCPContent;
-class ContentMenu : public boost::noncopyable
+
+class ContentMenu
{
public:
{
public:
- ContentMenu (wxWindow* p);
+ 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 ();
private:
void repeat ();
void join ();
void find_missing ();
void properties ();
+ void advanced ();
void re_examine ();
void kdm ();
void ov ();
void re_examine ();
void kdm ();
void ov ();
+ void set_dcp_settings ();
void remove ();
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() */
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;
wxWindow* _parent;
bool _pop_up_open;
ContentList _content;
@@
-62,10
+70,12
@@
private:
wxMenuItem* _join;
wxMenuItem* _find_missing;
wxMenuItem* _properties;
wxMenuItem* _join;
wxMenuItem* _find_missing;
wxMenuItem* _properties;
+ wxMenuItem* _advanced;
wxMenuItem* _re_examine;
wxMenuItem* _kdm;
wxMenuItem* _ov;
wxMenuItem* _choose_cpl;
wxMenuItem* _re_examine;
wxMenuItem* _kdm;
wxMenuItem* _ov;
wxMenuItem* _choose_cpl;
+ wxMenuItem* _set_dcp_settings;
wxMenuItem* _remove;
};
wxMenuItem* _remove;
};