projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Primitive auto-crop (#1477).
[dcpomatic.git]
/
src
/
wx
/
content_menu.h
diff --git
a/src/wx/content_menu.h
b/src/wx/content_menu.h
index 910afc7200f27a61d17e0a1930da8d7f12fc1b3c..6e1641e66587529ce2609f2a81d53b7e9da9e211 100644
(file)
--- a/
src/wx/content_menu.h
+++ b/
src/wx/content_menu.h
@@
-32,15
+32,17
@@
LIBDCP_ENABLE_WARNINGS
#include <memory>
#include <memory>
+class AutoCropDialog;
class DCPContent;
class Film;
class DCPContent;
class Film;
+class FilmViewer;
class Job;
class ContentMenu
{
public:
class Job;
class ContentMenu
{
public:
-
explicit ContentMenu (wxWindow* p
);
+
ContentMenu (wxWindow* parent, std::weak_ptr<FilmViewer> viewer
);
ContentMenu (ContentMenu const &) = delete;
ContentMenu& operator= (ContentMenu const &) = delete;
ContentMenu (ContentMenu const &) = delete;
ContentMenu& operator= (ContentMenu const &) = delete;
@@
-54,6
+56,7
@@
private:
void properties ();
void advanced ();
void re_examine ();
void properties ();
void advanced ();
void re_examine ();
+ void auto_crop ();
void kdm ();
void ov ();
void set_dcp_settings ();
void kdm ();
void ov ();
void set_dcp_settings ();
@@
-67,6
+70,7
@@
private:
std::weak_ptr<Film> _film;
wxWindow* _parent;
bool _pop_up_open;
std::weak_ptr<Film> _film;
wxWindow* _parent;
bool _pop_up_open;
+ std::weak_ptr<FilmViewer> _viewer;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;
@@
-75,11
+79,17
@@
private:
wxMenuItem* _properties;
wxMenuItem* _advanced;
wxMenuItem* _re_examine;
wxMenuItem* _properties;
wxMenuItem* _advanced;
wxMenuItem* _re_examine;
+ wxMenuItem* _auto_crop;
wxMenuItem* _kdm;
wxMenuItem* _ov;
wxMenuItem* _choose_cpl;
wxMenuItem* _set_dcp_settings;
wxMenuItem* _remove;
wxMenuItem* _kdm;
wxMenuItem* _ov;
wxMenuItem* _choose_cpl;
wxMenuItem* _set_dcp_settings;
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