Remove internal edit mode and add "content" tool.

[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 6fef5b94e49d6dead1bbcc54141db8c1cf6f8d87..979e2f487cc52e6ce0c5b5f42ef6e01bf2240b9b 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -25,8 +25,10 @@
 
 #include "ardour/audioengine.h"
 #include "ardour/automation_watch.h"
+#include "ardour/control_protocol_manager.h"
 #include "ardour/profile.h"
 #include "ardour/session.h"
+#include "control_protocol/control_protocol.h"
 
 #include "actions.h"
 #include "add_route_dialog.h"
@@ -182,7 +184,10 @@ ARDOUR_UI::set_session (Session *s)
 
        second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_second), 1000);
        point_one_second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_one_seconds), 100);
+#ifndef PLATFORM_WINDOWS
        point_zero_something_second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_zero_something_seconds), 40);
+#endif
+       set_fps_timeout_connection();
 
        update_format ();
 
@@ -222,10 +227,9 @@ ARDOUR_UI::set_session (Session *s)
                ArdourMeter::ResetGroupPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_group_peak_display));
 
                editor_meter_peak_display.set_name ("meterbridge peakindicator");
-               editor_meter_peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
                editor_meter_peak_display.unset_flags (Gtk::CAN_FOCUS);
-               editor_meter_peak_display.set_size_request(6, -1);
-               editor_meter_peak_display.set_corner_radius(2);
+               editor_meter_peak_display.set_size_request(8, -1);
+               editor_meter_peak_display.set_corner_radius(3);
 
                editor_meter_max_peak = -INFINITY;
                editor_meter_peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::editor_meter_peak_button_release), false);
@@ -262,11 +266,20 @@ ARDOUR_UI::unload_session (bool hide_stuff)
                }
        }
 
+       {
+               // tear down session specific CPI (owned by rc_config_editor which can remain)
+               ControlProtocolManager& m = ControlProtocolManager::instance ();
+               for (std::list<ControlProtocolInfo*>::iterator i = m.control_protocol_info.begin(); i != m.control_protocol_info.end(); ++i) {
+                       if (*i && (*i)->protocol && (*i)->protocol->has_editor ()) {
+                               (*i)->protocol->tear_down_gui ();
+                       }
+               }
+       }
+
        if (hide_stuff) {
                editor->hide ();
                mixer->hide ();
                meterbridge->hide ();
-               theme_manager->hide ();
                audio_port_matrix->hide();
                midi_port_matrix->hide();
                route_params->hide();
@@ -274,7 +287,10 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 
        second_connection.disconnect ();
        point_one_second_connection.disconnect ();
+#ifndef PLATFORM_WINDOWS
        point_zero_something_second_connection.disconnect();
+#endif
+       fps_connection.disconnect();
 
        if (editor_meter) {
                meter_box.remove(*editor_meter);
@@ -571,7 +587,7 @@ ARDOUR_UI::editor_meter_peak_button_release (GdkEventButton* ev)
        } else if (_session->master_out()) {
                ArdourMeter::ResetRoutePeakDisplays (_session->master_out().get());
        }
-       return true;
+       return false;
 }
 
 void