diff options
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index b8478d222a..999f3d3872 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -198,7 +198,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) _will_create_new_session_automatically = false; add_route_dialog = 0; route_params = 0; - option_editor = 0; + rc_option_editor = 0; location_ui = 0; open_session_selector = 0; have_configure_timeout = false; @@ -252,7 +252,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) } setup_gtk_ardour_enums (); - Config->set_current_owner (ConfigVariableBase::Interface); setup_profile (); GainMeter::setup_slider_pix (); @@ -361,10 +360,6 @@ ARDOUR_UI::post_engine () blink_timeout_tag = -1; - /* the global configuration object is now valid */ - - use_config (); - /* this being a GUI and all, we want peakfiles */ AudioFileSource::set_build_peakfiles (true); @@ -655,6 +650,8 @@ ARDOUR_UI::startup () exit (1); } + use_config (); + goto_editor_window (); BootMessage (_("Ardour is ready for use")); @@ -2466,8 +2463,6 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na connect_to_session (new_session); - Config->set_current_owner (ConfigVariableBase::Interface); - session_loaded = true; goto_editor_window (); @@ -3172,7 +3167,9 @@ ARDOUR_UI::use_config () { Glib::RefPtr<Action> act; - switch (Config->get_native_file_data_format ()) { + assert (session); + + switch (session->config.get_native_file_data_format ()) { case FormatFloat: act = ActionManager::get_action (X_("options"), X_("FileDataFormatFloat")); break; @@ -3189,7 +3186,7 @@ ARDOUR_UI::use_config () ract->set_active (); } - switch (Config->get_native_file_header_format ()) { + switch (session->config.get_native_file_header_format ()) { case BWF: act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatBWF")); break; |