smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-20 20:36:01 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Eliminating warings like:

Browse source 
warning:  ‘<class member declaration>’ will be initialized after
warning:   ‘<class member declaration>’
warning:   when initialized here
This commit is contained in:
Valeriy Kamyshniy 2015-04-06 23:06:23 +03:00
parent a51b033f9f
commit c7fcff380c
3 changed files with 45 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/public_editor.cc
View file

@ -30,8 +30,8 @@ sigc::signal<void> PublicEditor::DropDownKeys;
PublicEditor::PublicEditor (std::string layout_script)
: Window (Gtk::WINDOW_TOPLEVEL)
, WavesUI (layout_script, *this)
, VisibilityTracker (*((Gtk::Window*)this))
, WavesUI (layout_script, *this)
, _suspend_route_redisplay_counter (0)
{
}

45
gtk2_ardour/time_axis_view.cc
View file

@ -78,32 +78,34 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess,
Canvas& /*canvas*/,
WavesUI& ui)
: AxisView (sess)
, _name_editing (false)
, height (0)
, controls_event_box (ui.root ())
, time_axis_box (ui.root ())
, name_label (ui.get_label ("name_label"))
, name_entry (ui.get_entry ("name_entry"))
, number_label (ui.get_label ("number_label"))
, display_menu (0)
, parent (rent)
, selection_group (0)
, _ghost_group (0)
, _hidden (false)
, _number_is_hidden (false)
, in_destructor (false)
, _size_menu (0)
, _canvas_display (0)
, _y_position (0)
, _editor (ed)
, control_parent (0)
, _name_editing (false)
, height (0)
, _number_is_hidden (false)
, _hidden (false)
, in_destructor (false)
, _ebox_release_can_act (true)
, _y_position (0)
, _control_parent (0)
, _order (0)
, _effective_height (0)
, _resize_drag_start (-1)
, _preresize_cursor (0)
, _have_preresize_cursor (false)
, _try_to_change_height (false)
, _ebox_release_can_act (true)
, controls_event_box (ui.root ())//ui.get_container ("controls_event_box"))
, time_axis_box (ui.root ())
, name_entry (ui.get_entry ("name_entry"))
, name_label (ui.get_label ("name_label"))
, number_label (ui.get_label ("number_label"))
{
if (extra_height == 0) {
compute_heights ();
@ -123,11 +125,6 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess,
_ghost_group->lower_to_bottom();
_ghost_group->show();
//name_label.set_name ("TrackLabel");
//name_label.set_alignment (0.0, 0.5);
//ARDOUR_UI::instance()->set_tip (name_label, _("Track/Bus name (double click to edit)"));
// name_entry.set_name ("EditorTrackNameDisplay");
name_entry.signal_key_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_press), false);
name_entry.signal_key_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_release), false);
name_entry.signal_focus_out_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_out));
@ -197,9 +194,9 @@ TimeAxisView::hide ()
_canvas_display->hide ();
if (control_parent) {
control_parent->remove (time_axis_box);
control_parent = 0;
if (_control_parent) {
_control_parent->remove (time_axis_box);
_control_parent = 0;
}
_y_position = -1;
@ -230,10 +227,10 @@ guint32
TimeAxisView::show_at (double y, int& nth, VBox *parent)
{
time_axis_box.show ();
if (control_parent) {
control_parent->reorder_child (time_axis_box, nth);
if (_control_parent) {
_control_parent->reorder_child (time_axis_box, nth);
} else {
control_parent = parent;
_control_parent = parent;
parent->pack_start (time_axis_box, false, false);
parent->reorder_child (time_axis_box, nth);
}

45
gtk2_ardour/time_axis_view.h
View file

@ -211,29 +211,31 @@ class TimeAxisView : public virtual AxisView
protected:
/* The Standard LHS Controls */
Gtk::Container& controls_event_box;
Gtk::Container& time_axis_box;
Gtk::Label& name_label;
Gtk::Label& number_label;
bool _name_editing;
uint32_t height; /* in canvas units */
std::string controls_base_unselected_name;
std::string controls_base_selected_name;
Gtk::Menu* display_menu; /* The standard LHS Track control popup-menus */
TimeAxisView* parent;
ArdourCanvas::Container* selection_group;
Gtk::Container& controls_event_box;
Gtk::Container& time_axis_box;
Gtk::Label& name_label;
Gtk::Entry& name_entry;
Gtk::Label& number_label;
Gtk::Menu* display_menu; /* The standard LHS Track control popup-menus */
TimeAxisView* parent;
ArdourCanvas::Container* selection_group;
ArdourCanvas::Container* _ghost_group;
std::list<GhostRegion*> ghosts;
Gtk::Menu* _size_menu;
ArdourCanvas::Container* _canvas_display;
PublicEditor& _editor;
bool _name_editing;
uint32_t height; /* in canvas units */
std::string controls_base_unselected_name;
std::string controls_base_selected_name;
std::list<GhostRegion*> ghosts;
std::list<SelectionRect*> free_selection_rects;
std::list<SelectionRect*> used_selection_rects;
bool _number_is_hidden;
bool _hidden;
bool in_destructor;
bool _ebox_release_can_act;
Gtk::Menu* _size_menu;
ArdourCanvas::Container* _canvas_display;
double _y_position;
PublicEditor& _editor;
bool _number_is_hidden;
bool _hidden;
bool in_destructor;
bool _ebox_release_can_act;
double _y_position;
virtual bool can_edit_name() const;
@ -241,7 +243,6 @@ class TimeAxisView : public virtual AxisView
bool name_entry_key_press (GdkEventKey *ev);
bool name_entry_focus_out (GdkEventFocus *ev);
Gtk::Entry& name_entry;
void begin_name_edit ();
void end_name_edit (int);
@ -295,7 +296,7 @@ class TimeAxisView : public virtual AxisView
void build_size_menu ();
private:
Gtk::VBox* control_parent;
Gtk::VBox* _control_parent;
int _order;
uint32_t _effective_height;
double _resize_drag_start;