projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add bind().
[dcpomatic.git]
/
src
/
wx
/
content_menu.h
diff --git
a/src/wx/content_menu.h
b/src/wx/content_menu.h
index 0647331038b64d00477ca0e293abcf793d81a864..783a5be04067c83ff524f2b35888eb8c1dc73e88 100644
(file)
--- a/
src/wx/content_menu.h
+++ b/
src/wx/content_menu.h
@@
-18,55
+18,77
@@
*/
*/
+
#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 "timeline_content_view.h"
#include "lib/types.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
+#include <memory>
+
+class AutoCropDialog;
+class DCPContent;
class Film;
class Film;
+class FilmViewer;
class Job;
class Job;
-class DCPContent;
-class ContentMenu : public boost::noncopyable
+
+class ContentMenu
{
public:
{
public:
- ContentMenu (wxWindow* p);
+ ContentMenu(wxWindow* parent, FilmViewer& viewer);
+
+ 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 re_examine ();
+ void auto_crop ();
void kdm ();
void ov ();
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 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;
wxWindow* _parent;
bool _pop_up_open;
+ FilmViewer& _viewer;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;
wxMenuItem* _join;
wxMenuItem* _find_missing;
wxMenuItem* _properties;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;
wxMenuItem* _join;
wxMenuItem* _find_missing;
wxMenuItem* _properties;
+ wxMenuItem* _advanced;
wxMenuItem* _re_examine;
wxMenuItem* _re_examine;
+ wxMenuItem* _auto_crop;
wxMenuItem* _kdm;
wxMenuItem* _ov;
wxMenuItem* _choose_cpl;
wxMenuItem* _kdm;
wxMenuItem* _ov;
wxMenuItem* _choose_cpl;
+ wxMenuItem* _set_dcp_settings;
wxMenuItem* _remove;
wxMenuItem* _remove;
+
+ AutoCropDialog* _auto_crop_dialog = nullptr;
+ boost::signals2::scoped_connection _auto_crop_config_connection;
+ boost::signals2::scoped_connection _auto_crop_viewer_connection;
};
};
+
#endif
#endif