projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Draw reels in the timeline.
[dcpomatic.git]
/
src
/
wx
/
dcp_panel.h
diff --git
a/src/wx/dcp_panel.h
b/src/wx/dcp_panel.h
index 3aa97ad539cca5ac5869e948169954d86f010acb..da93e752a473abb1ef6c91d17d9b1cc23e9333fe 100644
(file)
--- a/
src/wx/dcp_panel.h
+++ b/
src/wx/dcp_panel.h
@@
-31,6
+31,8
@@
class wxButton;
class wxSpinCtrl;
class wxSizer;
class wxSpinCtrl;
class wxSizer;
+class AudioDialog;
+
class Film;
class DCPPanel : public boost::noncopyable
class Film;
class DCPPanel : public boost::noncopyable
@@
-65,14
+67,19
@@
private:
void three_d_changed ();
void standard_changed ();
void signed_toggled ();
void three_d_changed ();
void standard_changed ();
void signed_toggled ();
- void burn_subtitles_toggled ();
void encrypted_toggled ();
void edit_key_clicked ();
void audio_processor_changed ();
void encrypted_toggled ();
void edit_key_clicked ();
void audio_processor_changed ();
-
+ void show_audio_clicked ();
+ void reel_type_changed ();
+ void reel_length_changed ();
+
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 setup_audio_channels_choice ();
+
+ int minimum_allowed_audio_channels () const;
wxPanel* make_general_panel ();
wxPanel* make_video_panel ();
wxPanel* make_general_panel ();
wxPanel* make_video_panel ();
@@
-98,15
+105,19
@@
private:
wxSizer* _frame_rate_sizer;
wxChoice* _audio_channels;
wxChoice* _audio_processor;
wxSizer* _frame_rate_sizer;
wxChoice* _audio_channels;
wxChoice* _audio_processor;
+ wxButton* _show_audio;
wxButton* _best_frame_rate;
wxCheckBox* _three_d;
wxChoice* _resolution;
wxChoice* _standard;
wxCheckBox* _signed;
wxButton* _best_frame_rate;
wxCheckBox* _three_d;
wxChoice* _resolution;
wxChoice* _standard;
wxCheckBox* _signed;
- wxCheckBox* _burn_subtitles;
wxCheckBox* _encrypted;
wxStaticText* _key;
wxButton* _edit_key;
wxCheckBox* _encrypted;
wxStaticText* _key;
wxButton* _edit_key;
+ wxChoice* _reel_type;
+ wxSpinCtrl* _reel_length;
+
+ AudioDialog* _audio_dialog;
boost::shared_ptr<Film> _film;
bool _generally_sensitive;
boost::shared_ptr<Film> _film;
bool _generally_sensitive;