diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-22 18:52:40 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-22 19:48:30 -0500 |
| commit | 1f0fbea6285b5390c23c44233d55d15a4cbe9cd8 (patch) | |
| tree | b30fd739bf595da5f5ca808b9e0959aa8baa746c /gtk2_ardour/ardour_ui.h | |
| parent | 1211278a2b368a4acc0e26ae5f064544b4b1ffec (diff) | |
reorder members and constructors to ensure null pointers for ARDOUR_UI::{editor,mixer}
Diffstat (limited to 'gtk2_ardour/ardour_ui.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index f2cc1dde79..b4436aced8 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -332,6 +332,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void toggle_session_options_window (); private: + PublicEditor* editor; + Mixer_UI* mixer; Gtk::Tooltips _tooltips; NSM_Client* nsm; bool _was_dirty; @@ -621,10 +623,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void rename_session (); void setup_order_hint (); - Mixer_UI *mixer; int create_mixer (); - - PublicEditor *editor; int create_editor (); Meterbridge *meterbridge; |