Fix ExportFormatSpecification copy-c'tor

[ardour.git] / gtk2_ardour / ardour_ui_dialogs.cc

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 8a3b9d17229649a5fa38961ac7e5f87abeb06b8a..287c9128b47e3467585839eaffc45eae67ba8f2d 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -61,6 +61,7 @@
 #include "midi_tracer.h"
 #include "mini_timeline.h"
 #include "mixer_ui.h"
+#include "plugin_dspload_window.h"
 #include "public_editor.h"
 #include "processor_box.h"
 #include "rc_option_editor.h"
@@ -72,6 +73,7 @@
 #include "sfdb_ui.h"
 #include "time_info_box.h"
 #include "timers.h"
+#include "transport_masters_dialog.h"
 
 #include "pbd/i18n.h"
 
@@ -127,6 +129,9 @@ ARDOUR_UI::set_session (Session *s)
        big_clock->set_session (s);
        video_timeline->set_session (s);
        lua_script_window->set_session (s);
+       plugin_dsp_load_window->set_session (s);
+       transport_masters_window->set_session (s);
+       rc_option_editor->set_session (s);
 
        /* sensitize menu bar options that are now valid */
 
@@ -139,13 +144,6 @@ ARDOUR_UI::set_session (Session *s)
                ActionManager::set_sensitive (ActionManager::range_sensitive_actions, false);
        }
 
-       if (!_session->monitor_out()) {
-               Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), X_("SoloViaBus"));
-               if (act) {
-                       act->set_sensitive (false);
-               }
-       }
-
        /* allow wastebasket flush again */
 
        Glib::RefPtr<Action> act = ActionManager::get_action (X_("Main"), X_("FlushWastebasket"));
@@ -237,9 +235,9 @@ ARDOUR_UI::set_session (Session *s)
                        editor_meter->show();
                        editor_meter->ButtonPress.connect_same_thread (editor_meter_connection, boost::bind (&ARDOUR_UI::editor_meter_button_press, this, _1));
 
-                       editor_meter_table.set_homogeneous(true);
-                       editor_meter_table.attach(*editor_meter,             0,1, 0,2, SHRINK, EXPAND);
-                       editor_meter_table.attach(editor_meter_peak_display, 0,1, 2,3, EXPAND|FILL, EXPAND|FILL);
+                       editor_meter_table.set_spacings(3);
+                       editor_meter_table.attach(*editor_meter,             0,1, 0,1, FILL, FILL);
+                       editor_meter_table.attach(editor_meter_peak_display, 0,1, 1,2, FILL, EXPAND|FILL);
 
                        editor_meter->show();
                        editor_meter_peak_display.show();
@@ -251,7 +249,7 @@ ARDOUR_UI::set_session (Session *s)
 
                editor_meter_peak_display.set_name ("meterbridge peakindicator");
                editor_meter_peak_display.unset_flags (Gtk::CAN_FOCUS);
-               editor_meter_peak_display.set_size_request (std::max(9.f, rintf(8.f * UIConfiguration::instance().get_ui_scale())), -1);
+               editor_meter_peak_display.set_size_request (-1, std::max(6.f, rintf(5.f * UIConfiguration::instance().get_ui_scale())) );
                editor_meter_peak_display.set_corner_radius (3.0);
 
                editor_meter_max_peak = -INFINITY;
@@ -332,12 +330,10 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 
        blink_connection.disconnect ();
 
-       delete _session;
+       ARDOUR::Session* session_to_delete = _session;
        _session = 0;
+       delete session_to_delete;
 
-       session_loaded = false;
-
-       update_buffer_load ();
        update_title ();
 
        return 0;
@@ -714,14 +710,14 @@ ARDOUR_UI::tabbable_state_change (Tabbable& t)
        }
 
        for (std::vector<std::string>::iterator s = insensitive_action_names.begin(); s != insensitive_action_names.end(); ++s) {
-               action = ActionManager::get_action (X_("Common"), (*s).c_str());
+               action = ActionManager::get_action (X_("Common"), (*s).c_str(), false);
                if (action) {
                        action->set_sensitive (false);
                }
        }
 
        for (std::vector<std::string>::iterator s = sensitive_action_names.begin(); s != sensitive_action_names.end(); ++s) {
-               action = ActionManager::get_action (X_("Common"), (*s).c_str());
+               action = ActionManager::get_action (X_("Common"), (*s).c_str(), false);
                if (action) {
                        action->set_sensitive (true);
                }
@@ -956,25 +952,3 @@ ARDOUR_UI::toggle_mixer_space()
                }
        }
 }
-
-void
-ARDOUR_UI::toggle_mixer_list()
-{
-       Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMixerList");
-
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-                       mixer->show_mixer_list (tact->get_active());
-       }
-}
-
-void
-ARDOUR_UI::toggle_monitor_section_visibility ()
-{
-       Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
-
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-                       mixer->show_monitor_section (tact->get_active());
-       }
-}