Reset export-config maps before each new export (1/2)

[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 8b6eaa044bff4c4cb3a8956d704b646c739d5b6c..aabfbfd0beced7d0384cf282cf6c6125cacc1cd0 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -209,21 +209,19 @@ ARDOUR_UI::set_session (Session *s)
 
        update_format ();
 
-       if (meter_box.get_parent()) {
-               transport_hbox.remove (meter_box);
-               transport_hbox.remove (editor_meter_peak_display);
+       if (editor_meter_table.get_parent()) {
+               transport_hbox.remove (editor_meter_table);
        }
 
        if (editor_meter) {
-               meter_box.remove(*editor_meter);
+               editor_meter_table.remove(*editor_meter);
                delete editor_meter;
                editor_meter = 0;
                editor_meter_peak_display.hide();
        }
 
-       if (meter_box.get_parent()) {
-               transport_hbox.remove (meter_box);
-               transport_hbox.remove (editor_meter_peak_display);
+       if (editor_meter_table.get_parent()) {
+               transport_hbox.remove (editor_meter_table);
        }
 
        if (_session &&
@@ -237,9 +235,14 @@ ARDOUR_UI::set_session (Session *s)
                        editor_meter->set_meter_type (_session->master_out()->meter_type());
                        editor_meter->setup_meters (30, 10, 6);
                        editor_meter->show();
-                       meter_box.pack_start(*editor_meter);
-
                        editor_meter->ButtonPress.connect_same_thread (editor_meter_connection, boost::bind (&ARDOUR_UI::editor_meter_button_press, this, _1));
+
+                       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();
                }
 
                ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display));
@@ -248,7 +251,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;
@@ -309,7 +312,7 @@ ARDOUR_UI::unload_session (bool hide_stuff)
        fps_connection.disconnect();
 
        if (editor_meter) {
-               meter_box.remove(*editor_meter);
+               editor_meter_table.remove(*editor_meter);
                delete editor_meter;
                editor_meter = 0;
                editor_meter_peak_display.hide();
@@ -334,7 +337,6 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 
        session_loaded = false;
 
-       update_buffer_load ();
        update_title ();
 
        return 0;