From 1f0fbea6285b5390c23c44233d55d15a4cbe9cd8 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 22 Dec 2014 18:52:40 -0500 Subject: reorder members and constructors to ensure null pointers for ARDOUR_UI::{editor,mixer} --- gtk2_ardour/ardour_ui.cc | 5 +++-- gtk2_ardour/ardour_ui.h | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 9b6fc176a0..b3298be777 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -166,14 +166,15 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) , primary_clock (new MainClock (X_("primary"), false, X_("transport"), true, true, true, false, true)) , secondary_clock (new MainClock (X_("secondary"), false, X_("secondary"), true, true, false, false, true)) - + /* big clock */ , big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false)) , video_timeline(0) /* start of private members */ - + , editor (0) + , mixer (0) , nsm (0) , _was_dirty (false) , _mixer_on_top (false) 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; -- cgit v1.2.3