projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
film_editor.h
diff --git
a/src/wx/film_editor.h
b/src/wx/film_editor.h
index 4b096a2e15242ac592280e6075da30e8798a6f7d..705eb16af9b98f6305a3d28d4d7d251f339e56fc 100644
(file)
--- a/
src/wx/film_editor.h
+++ b/
src/wx/film_editor.h
@@
-97,6
+97,8
@@
private:
void start_changed ();
void length_changed ();
void ratio_changed (wxCommandEvent &);
void start_changed ();
void length_changed ();
void ratio_changed (wxCommandEvent &);
+ void pad_with_silence_toggled (wxCommandEvent &);
+ void minimum_audio_channels_changed (wxCommandEvent &);
/* Handle changes to the model */
void film_changed (Film::Property);
/* Handle changes to the model */
void film_changed (Film::Property);
@@
-113,6
+115,7
@@
private:
void setup_container ();
void setup_content_sensitivity ();
void setup_loop_sensitivity ();
void setup_container ();
void setup_content_sensitivity ();
void setup_loop_sensitivity ();
+ void setup_minimum_audio_channels ();
void active_jobs_changed (bool);
boost::shared_ptr<Content> selected_content ();
void active_jobs_changed (bool);
boost::shared_ptr<Content> selected_content ();
@@
-167,6
+170,8
@@
private:
wxChoice* _dcp_content_type;
wxChoice* _dcp_frame_rate;
wxButton* _best_dcp_frame_rate;
wxChoice* _dcp_content_type;
wxChoice* _dcp_frame_rate;
wxButton* _best_dcp_frame_rate;
+ wxCheckBox* _pad_with_silence;
+ wxSpinCtrl* _minimum_audio_channels;
wxChoice* _audio_stream;
wxStaticText* _audio_description;
wxChoice* _subtitle_stream;
wxChoice* _audio_stream;
wxStaticText* _audio_description;
wxChoice* _subtitle_stream;