summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-12-02 23:54:49 +0100
committerCarl Hetherington <cth@carlh.net>2021-12-03 21:23:07 +0100
commit211d9b077e7713cb1ca033fc88e200719a913a67 (patch)
tree935a1534c7ed96390ab5142e427ab0cba9d43bd7
parent8b9d544ba275c9ff19fbcfffafdd28a6d1a8601d (diff)
Initialise some class members for belt and braces.
-rw-r--r--src/wx/audio_panel.h28
-rw-r--r--src/wx/text_panel.h52
-rw-r--r--src/wx/timing_panel.h36
-rw-r--r--src/wx/video_panel.h58
4 files changed, 87 insertions, 87 deletions
diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h
index 5e8f92597..4288cbda5 100644
--- a/src/wx/audio_panel.h
+++ b/src/wx/audio_panel.h
@@ -57,20 +57,20 @@ private:
void add_to_grid () override;
boost::optional<float> peak () const;
- wxCheckBox* _reference;
- wxStaticText* _reference_note;
- wxButton* _show;
- wxStaticText* _gain_label;
- wxStaticText* _gain_db_label;
- ContentSpinCtrlDouble<AudioContent>* _gain;
- wxButton* _gain_calculate_button;
- wxStaticText* _peak;
- wxStaticText* _delay_label;
- wxStaticText* _delay_ms_label;
- ContentSpinCtrl<AudioContent>* _delay;
- AudioMappingView* _mapping;
- wxStaticText* _description;
- AudioDialog* _audio_dialog;
+ wxCheckBox* _reference = nullptr;
+ wxStaticText* _reference_note = nullptr;
+ wxButton* _show = nullptr;
+ wxStaticText* _gain_label = nullptr;
+ wxStaticText* _gain_db_label = nullptr;
+ ContentSpinCtrlDouble<AudioContent>* _gain = nullptr;
+ wxButton* _gain_calculate_button = nullptr;
+ wxStaticText* _peak = nullptr;
+ wxStaticText* _delay_label = nullptr;
+ wxStaticText* _delay_ms_label = nullptr;
+ ContentSpinCtrl<AudioContent>* _delay = nullptr;
+ AudioMappingView* _mapping = nullptr;
+ wxStaticText* _description = nullptr;
+ AudioDialog* _audio_dialog = nullptr;
boost::signals2::scoped_connection _mapping_connection;
boost::signals2::scoped_connection _active_jobs_connection;
diff --git a/src/wx/text_panel.h b/src/wx/text_panel.h
index c4498f970..6c320782a 100644
--- a/src/wx/text_panel.h
+++ b/src/wx/text_panel.h
@@ -72,38 +72,38 @@ private:
void update_outline_subtitles_in_viewer ();
void clear_outline_subtitles ();
- wxCheckBox* _reference;
- wxStaticText* _reference_note;
+ wxCheckBox* _reference = nullptr;
+ wxStaticText* _reference_note = nullptr;
wxCheckBox* _outline_subtitles = nullptr;
- wxCheckBox* _use;
- wxChoice* _type;
- wxCheckBox* _burn;
- wxStaticText* _offset_label;
- wxStaticText* _x_offset_label;
- wxStaticText* _x_offset_pc_label;
- wxStaticText* _y_offset_label;
- wxStaticText* _y_offset_pc_label;
- SpinCtrl* _x_offset;
- SpinCtrl* _y_offset;
- wxStaticText* _scale_label;
- wxStaticText* _x_scale_label;
- wxStaticText* _x_scale_pc_label;
- wxStaticText* _y_scale_label;
- wxStaticText* _y_scale_pc_label;
- SpinCtrl* _x_scale;
- SpinCtrl* _y_scale;
- wxStaticText* _line_spacing_label;
- wxStaticText* _line_spacing_pc_label;
- SpinCtrl* _line_spacing;
+ wxCheckBox* _use = nullptr;
+ wxChoice* _type = nullptr;
+ wxCheckBox* _burn = nullptr;
+ wxStaticText* _offset_label = nullptr;
+ wxStaticText* _x_offset_label = nullptr;
+ wxStaticText* _x_offset_pc_label = nullptr;
+ wxStaticText* _y_offset_label = nullptr;
+ wxStaticText* _y_offset_pc_label = nullptr;
+ SpinCtrl* _x_offset = nullptr;
+ SpinCtrl* _y_offset = nullptr;
+ wxStaticText* _scale_label = nullptr;
+ wxStaticText* _x_scale_label = nullptr;
+ wxStaticText* _x_scale_pc_label = nullptr;
+ wxStaticText* _y_scale_label = nullptr;
+ wxStaticText* _y_scale_pc_label = nullptr;
+ SpinCtrl* _x_scale = nullptr;
+ SpinCtrl* _y_scale = nullptr;
+ wxStaticText* _line_spacing_label = nullptr;
+ wxStaticText* _line_spacing_pc_label = nullptr;
+ SpinCtrl* _line_spacing = nullptr;
wxStaticText* _dcp_track_label = nullptr;
wxChoice* _dcp_track = nullptr;
- wxStaticText* _stream_label;
- wxChoice* _stream;
- wxButton* _text_view_button;
+ wxStaticText* _stream_label = nullptr;
+ wxChoice* _stream = nullptr;
+ wxButton* _text_view_button = nullptr;
TextView* _text_view = nullptr;
wxButton* _fonts_dialog_button;
FontsDialog* _fonts_dialog = nullptr;
- wxButton* _appearance_dialog_button;
+ wxButton* _appearance_dialog_button = nullptr;
TextType _original_type;
wxStaticText* _language_label = nullptr;
LanguageTagWidget* _language = nullptr;
diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index f5c9893de..f09c40141 100644
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -50,24 +50,24 @@ private:
std::weak_ptr<FilmViewer> _viewer;
- wxStaticText* _h_label;
- wxStaticText* _m_label;
- wxStaticText* _s_label;
- wxStaticText* _f_label;
- wxStaticText* _colon[3];
- wxStaticText* _position_label;
- Timecode<dcpomatic::DCPTime>* _position;
- wxButton* _move_to_start_of_reel;
- wxStaticText* _full_length_label;
- Timecode<dcpomatic::DCPTime>* _full_length;
- wxStaticText* _trim_start_label;
- Timecode<dcpomatic::ContentTime>* _trim_start;
- wxButton* _trim_start_to_playhead;
- wxButton* _trim_end_to_playhead;
- wxStaticText* _trim_end_label;
- Timecode<dcpomatic::ContentTime>* _trim_end;
- wxStaticText* _play_length_label;
- Timecode<dcpomatic::DCPTime>* _play_length;
+ wxStaticText* _h_label = nullptr;
+ wxStaticText* _m_label = nullptr;
+ wxStaticText* _s_label = nullptr;
+ wxStaticText* _f_label = nullptr;
+ wxStaticText* _colon[3] = { nullptr, nullptr, nullptr };
+ wxStaticText* _position_label = nullptr;
+ Timecode<dcpomatic::DCPTime>* _position = nullptr;
+ wxButton* _move_to_start_of_reel = nullptr;
+ wxStaticText* _full_length_label = nullptr;
+ Timecode<dcpomatic::DCPTime>* _full_length = nullptr;
+ wxStaticText* _trim_start_label = nullptr;
+ Timecode<dcpomatic::ContentTime>* _trim_start = nullptr;
+ wxButton* _trim_start_to_playhead = nullptr;
+ wxButton* _trim_end_to_playhead = nullptr;
+ wxStaticText* _trim_end_label = nullptr;
+ Timecode<dcpomatic::ContentTime>* _trim_end = nullptr;
+ wxStaticText* _play_length_label = nullptr;
+ Timecode<dcpomatic::DCPTime>* _play_length = nullptr;
Suspender _film_content_changed_suspender;
};
diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 2d25f82af..92780d218 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -71,35 +71,35 @@ private:
void setup_description ();
void setup_sensitivity ();
- wxCheckBox* _reference;
- wxStaticText* _reference_note;
- wxStaticText* _type_label;
- ContentChoice<VideoContent, VideoFrameType>* _frame_type;
- wxStaticText* _crop_label;
- wxStaticText* _left_crop_label;
- ContentSpinCtrl<VideoContent>* _left_crop;
- wxToggleButton* _left_right_link;
- wxStaticText* _right_crop_label;
- ContentSpinCtrl<VideoContent>* _right_crop;
- wxStaticText* _top_crop_label;
- ContentSpinCtrl<VideoContent>* _top_crop;
- wxToggleButton* _top_bottom_link;
- wxStaticText* _bottom_crop_label;
- ContentSpinCtrl<VideoContent>* _bottom_crop;
- wxStaticText* _fade_in_label;
- Timecode<dcpomatic::ContentTime>* _fade_in;
- wxStaticText* _fade_out_label;
- Timecode<dcpomatic::ContentTime>* _fade_out;
- wxStaticText* _scale_label;
- wxRadioButton* _scale_fit;
- wxRadioButton* _scale_custom;
- wxButton* _scale_custom_edit;
- wxStaticText* _description;
- wxStaticText* _colour_conversion_label;
- wxChoice* _colour_conversion;
- wxButton* _edit_colour_conversion_button;
- wxStaticText* _range_label;
- wxChoice* _range;
+ wxCheckBox* _reference = nullptr;
+ wxStaticText* _reference_note = nullptr;
+ wxStaticText* _type_label = nullptr;
+ ContentChoice<VideoContent, VideoFrameType>* _frame_type = nullptr;
+ wxStaticText* _crop_label = nullptr;
+ wxStaticText* _left_crop_label = nullptr;
+ ContentSpinCtrl<VideoContent>* _left_crop = nullptr;
+ wxToggleButton* _left_right_link = nullptr;
+ wxStaticText* _right_crop_label = nullptr;
+ ContentSpinCtrl<VideoContent>* _right_crop = nullptr;
+ wxStaticText* _top_crop_label = nullptr;
+ ContentSpinCtrl<VideoContent>* _top_crop = nullptr;
+ wxToggleButton* _top_bottom_link = nullptr;
+ wxStaticText* _bottom_crop_label = nullptr;
+ ContentSpinCtrl<VideoContent>* _bottom_crop = nullptr;
+ wxStaticText* _fade_in_label = nullptr;
+ Timecode<dcpomatic::ContentTime>* _fade_in = nullptr;
+ wxStaticText* _fade_out_label = nullptr;
+ Timecode<dcpomatic::ContentTime>* _fade_out = nullptr;
+ wxStaticText* _scale_label = nullptr;
+ wxRadioButton* _scale_fit = nullptr;
+ wxRadioButton* _scale_custom = nullptr;
+ wxButton* _scale_custom_edit = nullptr;
+ wxStaticText* _description = nullptr;
+ wxStaticText* _colour_conversion_label = nullptr;
+ wxChoice* _colour_conversion = nullptr;
+ wxButton* _edit_colour_conversion_button = nullptr;
+ wxStaticText* _range_label = nullptr;
+ wxChoice* _range = nullptr;
bool _left_changed_last = true;
bool _top_changed_last = true;