projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add button to send test emails in the mail server prefs (#2216).
[dcpomatic.git]
/
src
/
wx
/
dcp_panel.h
diff --git
a/src/wx/dcp_panel.h
b/src/wx/dcp_panel.h
index f2e0455c97f3ff1eec43bd6374ace3fde183ca09..9da7a692989074821dacd99114e9d5071ea99b65 100644
(file)
--- a/
src/wx/dcp_panel.h
+++ b/
src/wx/dcp_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,9
+18,12
@@
*/
*/
-#include <boost/shared_ptr.hpp>
-#include <boost/noncopyable.hpp>
+#include "lib/config.h"
+#include "lib/film.h"
+
+
+class Button;
class wxNotebook;
class wxPanel;
class wxBoxSizer;
class wxNotebook;
class wxPanel;
class wxBoxSizer;
@@
-31,20
+34,29
@@
class wxChoice;
class wxButton;
class wxSpinCtrl;
class wxSizer;
class wxButton;
class wxSpinCtrl;
class wxSizer;
+class wxGridBagSizer;
class AudioDialog;
class AudioDialog;
+class MarkersDialog;
+class InteropMetadataDialog;
+class SMPTEMetadataDialog;
class Film;
class Film;
+class FilmViewer;
class Ratio;
class Ratio;
-class DCPPanel : public boost::noncopyable
+
+class DCPPanel
{
public:
{
public:
- DCPPanel (wxNotebook *,
boost::shared_ptr<Film>
);
+ DCPPanel (wxNotebook *,
std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer
);
- void set_film (boost::shared_ptr<Film>);
+ DCPPanel (DCPPanel const&) = delete;
+ DCPPanel& operator= (DCPPanel const&) = delete;
+
+ void set_film (std::shared_ptr<Film>);
void set_general_sensitivity (bool);
void set_general_sensitivity (bool);
- void film_changed (
int
);
+ void film_changed (
Film::Property
);
void film_content_changed (int);
wxPanel* panel () const {
void film_content_changed (int);
wxPanel* panel () const {
@@
-54,7
+66,6
@@
public:
private:
void name_changed ();
void use_isdcf_name_toggled ();
private:
void name_changed ();
void use_isdcf_name_toggled ();
- void edit_isdcf_button_clicked ();
void copy_isdcf_name_button_clicked ();
void container_changed ();
void dcp_content_type_changed ();
void copy_isdcf_name_button_clicked ();
void container_changed ();
void dcp_content_type_changed ();
@@
-67,18
+78,24
@@
private:
void resolution_changed ();
void three_d_changed ();
void standard_changed ();
void resolution_changed ();
void three_d_changed ();
void standard_changed ();
- void signed_toggled ();
void encrypted_toggled ();
void encrypted_toggled ();
- void edit_key_clicked ();
void audio_processor_changed ();
void show_audio_clicked ();
void reel_type_changed ();
void reel_length_changed ();
void audio_processor_changed ();
void show_audio_clicked ();
void reel_type_changed ();
void reel_length_changed ();
- void upload_after_make_dcp_changed ();
+ void markers_clicked ();
+ void metadata_clicked ();
+ void reencode_j2k_changed ();
+ void enable_audio_language_toggled ();
+ void edit_audio_language_clicked ();
void setup_frame_rate_widget ();
void setup_container ();
void setup_dcp_name ();
void setup_frame_rate_widget ();
void setup_container ();
void setup_dcp_name ();
+ void add_to_grid ();
+ void add_video_panel_to_grid ();
+ void add_audio_panel_to_grid ();
+ void add_audio_processors ();
int minimum_allowed_audio_channels () const;
int minimum_allowed_audio_channels () const;
@@
-86,41
+103,65
@@
private:
wxPanel* make_video_panel ();
wxPanel* make_audio_panel ();
wxPanel* make_video_panel ();
wxPanel* make_audio_panel ();
- void config_changed ();
+ void config_changed (Config::Property p);
+
+ void setup_sensitivity ();
wxPanel* _panel;
wxNotebook* _notebook;
wxBoxSizer* _sizer;
wxPanel* _panel;
wxNotebook* _notebook;
wxBoxSizer* _sizer;
+ wxGridBagSizer* _grid;
+ wxGridBagSizer* _video_grid;
+ wxGridBagSizer* _audio_grid;
+ wxStaticText* _name_label;
wxTextCtrl* _name;
wxStaticText* _dcp_name;
wxCheckBox* _use_isdcf_name;
wxTextCtrl* _name;
wxStaticText* _dcp_name;
wxCheckBox* _use_isdcf_name;
+ wxCheckBox* _enable_audio_language = nullptr;
+ wxStaticText* _audio_language = nullptr;
+ Button* _edit_audio_language = nullptr;
+ wxStaticText* _container_label;
wxChoice* _container;
wxStaticText* _container_size;
wxChoice* _container;
wxStaticText* _container_size;
- wxButton* _edit_isdcf_button;
wxButton* _copy_isdcf_name_button;
wxButton* _copy_isdcf_name_button;
+ wxStaticText* _j2k_bandwidth_label;
+ wxStaticText* _mbits_label;
wxSpinCtrl* _j2k_bandwidth;
wxSpinCtrl* _j2k_bandwidth;
+ wxStaticText* _dcp_content_type_label;
wxChoice* _dcp_content_type;
wxChoice* _dcp_content_type;
+ wxStaticText* _frame_rate_label;
wxChoice* _frame_rate_choice;
wxSpinCtrl* _frame_rate_spin;
wxSizer* _frame_rate_sizer;
wxChoice* _frame_rate_choice;
wxSpinCtrl* _frame_rate_spin;
wxSizer* _frame_rate_sizer;
+ wxStaticText* _channels_label;
wxChoice* _audio_channels;
wxChoice* _audio_channels;
+ wxStaticText* _processor_label;
wxChoice* _audio_processor;
wxButton* _show_audio;
wxButton* _best_frame_rate;
wxCheckBox* _three_d;
wxChoice* _audio_processor;
wxButton* _show_audio;
wxButton* _best_frame_rate;
wxCheckBox* _three_d;
+ wxCheckBox* _reencode_j2k;
+ wxStaticText* _resolution_label;
wxChoice* _resolution;
wxChoice* _resolution;
+ wxStaticText* _standard_label;
wxChoice* _standard;
wxChoice* _standard;
- wxCheckBox* _signed;
wxCheckBox* _encrypted;
wxCheckBox* _encrypted;
- wxStaticText* _key;
- wxButton* _edit_key;
+ wxStaticText* _reels_label;
wxChoice* _reel_type;
wxChoice* _reel_type;
+ wxStaticText* _reel_length_label;
+ wxStaticText* _reel_length_gb_label;
wxSpinCtrl* _reel_length;
wxSpinCtrl* _reel_length;
- wxCheckBox* _upload_after_make_dcp;
+ wxButton* _markers;
+ wxButton* _metadata;
+ wxSizer* _audio_panel_sizer;
- AudioDialog* _audio_dialog;
+ AudioDialog* _audio_dialog = nullptr;
+ MarkersDialog* _markers_dialog = nullptr;
+ InteropMetadataDialog* _interop_metadata_dialog = nullptr;
+ SMPTEMetadataDialog* _smpte_metadata_dialog = nullptr;
- boost::shared_ptr<Film> _film;
+ std::shared_ptr<Film> _film;
+ std::weak_ptr<FilmViewer> _viewer;
bool _generally_sensitive;
};
bool _generally_sensitive;
};