ardour/livetrax
13
0
Fork 0
Code

revert UIConfiguration back to a normal member of ARDOUR_UI

Browse Source
This commit is contained in:
Paul Davis 2014-12-07 13:12:21 -05:00
parent d586289be5
commit 8f4ab08e20
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/ardour_ui.cc
View File

@ -150,7 +150,6 @@ using namespace Gtk;
using namespace std; using namespace std;
ARDOUR_UI *ARDOUR_UI::theArdourUI = 0; ARDOUR_UI *ARDOUR_UI::theArdourUI = 0;
UIConfiguration *ARDOUR_UI::ui_config = 0;
sigc::signal<void,bool> ARDOUR_UI::Blink; sigc::signal<void,bool> ARDOUR_UI::Blink;
sigc::signal<void> ARDOUR_UI::RapidScreenUpdate; sigc::signal<void> ARDOUR_UI::RapidScreenUpdate;
@ -162,7 +161,7 @@ sigc::signal<void> ARDOUR_UI::CloseAllDialogs;
ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
: Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp) : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp)
, ui_config (new UIConfiguration)
, gui_object_state (new GUIObjectState) , gui_object_state (new GUIObjectState)
, primary_clock (new MainClock (X_("primary"), false, X_("transport"), true, true, true, false, true)) , primary_clock (new MainClock (X_("primary"), false, X_("transport"), true, true, true, false, true))
@ -397,12 +396,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
attach_to_engine (); attach_to_engine ();
} }
void
ARDOUR_UI::create_configuration ()
{
ui_config = new UIConfiguration();
}
GlobalPortMatrixWindow* GlobalPortMatrixWindow*
ARDOUR_UI::create_global_port_matrix (ARDOUR::DataType type) ARDOUR_UI::create_global_port_matrix (ARDOUR::DataType type)
{ {

13
gtk2_ardour/ardour_ui.h
View File

@ -129,6 +129,12 @@ namespace Gtkmm2ext {
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
{ {
private:
/* This must be the first data element because constructor ordering
relies on it.
*/
UIConfiguration* ui_config;
public: public:
ARDOUR_UI (int *argcp, char **argvp[], const char* localedir); ARDOUR_UI (int *argcp, char **argvp[], const char* localedir);
~ARDOUR_UI(); ~ARDOUR_UI();
@ -168,8 +174,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void save_state (const std::string & state_name = "", bool switch_to_it = false); void save_state (const std::string & state_name = "", bool switch_to_it = false);
static ARDOUR_UI *instance () { return theArdourUI; } static ARDOUR_UI *instance () { return theArdourUI; }
static UIConfiguration *config () { return ui_config; } static UIConfiguration *config () { return theArdourUI->ui_config; }
static void create_configuration();
PublicEditor& the_editor(){return *editor;} PublicEditor& the_editor(){return *editor;}
Mixer_UI* the_mixer() { return mixer; } Mixer_UI* the_mixer() { return mixer; }
@ -324,7 +329,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
private: private:
Gtk::Tooltips _tooltips; Gtk::Tooltips _tooltips;
NSM_Client *nsm; NSM_Client* nsm;
bool _was_dirty; bool _was_dirty;
bool _mixer_on_top; bool _mixer_on_top;
bool first_time_engine_run; bool first_time_engine_run;
@ -649,8 +654,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
BigClockWindow* create_big_clock_window(); BigClockWindow* create_big_clock_window();
GlobalPortMatrixWindow* create_global_port_matrix (ARDOUR::DataType); GlobalPortMatrixWindow* create_global_port_matrix (ARDOUR::DataType);
static UIConfiguration *ui_config;
ARDOUR::SystemExec *video_server_process; ARDOUR::SystemExec *video_server_process;
void handle_locations_change (ARDOUR::Location*); void handle_locations_change (ARDOUR::Location*);

1
gtk2_ardour/main.cc
View File

@ -271,7 +271,6 @@ int main (int argc, char *argv[])
#endif #endif
try { try {
ARDOUR_UI::create_configuration ();
ui = new ARDOUR_UI (&argc, &argv, localedir); ui = new ARDOUR_UI (&argc, &argv, localedir);
} catch (failed_constructor& err) { } catch (failed_constructor& err) {
error << string_compose (_("could not create %1 GUI"), PROGRAM_NAME) << endmsg; error << string_compose (_("could not create %1 GUI"), PROGRAM_NAME) << endmsg;