smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

reorder members and constructors to ensure null pointers for ARDOUR_UI::{editor,mixer}

Browse source
This commit is contained in:
Paul Davis 2014-12-22 18:52:40 -05:00
parent 1211278a2b
commit 1f0fbea628
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gtk2_ardour/ardour_ui.cc
View file

@ -173,7 +173,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
, video_timeline(0) , video_timeline(0)
/* start of private members */ /* start of private members */
, editor (0)
, mixer (0)
, nsm (0) , nsm (0)
, _was_dirty (false) , _was_dirty (false)
, _mixer_on_top (false) , _mixer_on_top (false)

5
gtk2_ardour/ardour_ui.h
View file

@ -332,6 +332,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void toggle_session_options_window (); void toggle_session_options_window ();
private: private:
PublicEditor* editor;
Mixer_UI* mixer;
Gtk::Tooltips _tooltips; Gtk::Tooltips _tooltips;
NSM_Client* nsm; NSM_Client* nsm;
bool _was_dirty; bool _was_dirty;
@ -621,10 +623,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void rename_session (); void rename_session ();
void setup_order_hint (); void setup_order_hint ();
Mixer_UI *mixer;
int create_mixer (); int create_mixer ();
PublicEditor *editor;
int create_editor (); int create_editor ();
Meterbridge *meterbridge; Meterbridge *meterbridge;