Merge branch 'master' into windows
[ardour.git] / gtk2_ardour / ardour_ui_dialogs.cc
index 9b9bc3c1e2f360d011946767c17751d4ab995347..1b39da19e2dbf7b0735ee04391196eb1998dadfb 100644 (file)
 */
 
 #include "ardour/session.h"
+#include "ardour/audioengine.h"
+#include "ardour/automation_watch.h"
+
+#ifdef interface
+#undef interface
+#endif
 
 #include "actions.h"
+#include "add_route_dialog.h"
+#include "add_video_dialog.h"
 #include "ardour_ui.h"
+#include "big_clock_window.h"
+#include "bundle_manager.h"
+#include "global_port_matrix.h"
+#include "gui_object.h"
+#include "gui_thread.h"
+#include "keyeditor.h"
 #include "location_ui.h"
+#include "main_clock.h"
+#include "meter_patterns.h"
+#include "midi_tracer.h"
 #include "mixer_ui.h"
-#include "rc_option_editor.h"
-#include "session_option_editor.h"
 #include "public_editor.h"
+#include "rc_option_editor.h"
 #include "route_params_ui.h"
+#include "shuttle_control.h"
+#include "session_option_editor.h"
+#include "speaker_dialog.h"
+#include "splash.h"
 #include "sfdb_ui.h"
 #include "theme_manager.h"
-#include "bundle_manager.h"
-#include "keyeditor.h"
+#include "time_info_box.h"
+
+#include <gtkmm2ext/keyboard.h>
 
 #include "i18n.h"
 
@@ -47,25 +68,58 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 
 void
-ARDOUR_UI::connect_to_session (Session *s)
+ARDOUR_UI::set_session (Session *s)
 {
-       session = s;
+       SessionHandlePtr::set_session (s);
+
+
+       if (!_session) {
+               WM::Manager::instance().set_session (s);
+               /* Session option editor cannot exist across change-of-session */
+               session_option_editor.drop_window ();
+               /* Ditto for AddVideoDialog */
+               add_video_dialog.drop_window ();
+               return;
+       }
+
+       const XMLNode* node = _session->extra_xml (X_("UI"));
 
-       session->Xrun.connect (sigc::mem_fun(*this, &ARDOUR_UI::xrun_handler));
-       session->RecordStateChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::record_state_changed));
+       if (node) {
+               const XMLNodeList& children = node->children();
+               for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
+                       if ((*i)->name() == GUIObjectState::xml_node_name) {
+                               gui_object_state->load (**i);
+                               break;
+                       }
+               }
+       }
+
+       WM::Manager::instance().set_session (s);
+
+       AutomationWatch::instance().set_session (s);
+
+       if (shuttle_box) {
+               shuttle_box->set_session (s);
+       }
+
+       primary_clock->set_session (s);
+       secondary_clock->set_session (s);
+       big_clock->set_session (s);
+       time_info_box->set_session (s);
+       video_timeline->set_session (s);
 
        /* sensitize menu bar options that are now valid */
 
        ActionManager::set_sensitive (ActionManager::session_sensitive_actions, true);
-       ActionManager::set_sensitive (ActionManager::write_sensitive_actions, session->writable());
+       ActionManager::set_sensitive (ActionManager::write_sensitive_actions, _session->writable());
 
-       if (session->locations()->num_range_markers()) {
+       if (_session->locations()->num_range_markers()) {
                ActionManager::set_sensitive (ActionManager::range_sensitive_actions, true);
        } else {
                ActionManager::set_sensitive (ActionManager::range_sensitive_actions, false);
        }
 
-       if (!session->control_out()) {
+       if (!_session->monitor_out()) {
                Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), X_("SoloViaBus"));
                if (act) {
                        act->set_sensitive (false);
@@ -87,19 +141,9 @@ ARDOUR_UI::connect_to_session (Session *s)
        ActionManager::set_sensitive (ActionManager::point_selection_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::playlist_selection_sensitive_actions, false);
 
-       session->locations()->added.connect (sigc::mem_fun (*this, &ARDOUR_UI::handle_locations_change));
-       session->locations()->removed.connect (sigc::mem_fun (*this, &ARDOUR_UI::handle_locations_change));
-
        rec_button.set_sensitive (true);
-       shuttle_box.set_sensitive (true);
 
-       if (location_ui) {
-               location_ui->set_session(s);
-       }
-
-       if (route_params) {
-               route_params->set_session (s);
-       }
+       solo_alert_button.set_active (_session->soloing());
 
        setup_session_options ();
 
@@ -107,31 +151,19 @@ ARDOUR_UI::connect_to_session (Session *s)
        Blink.connect (sigc::mem_fun(*this, &ARDOUR_UI::solo_blink));
        Blink.connect (sigc::mem_fun(*this, &ARDOUR_UI::sync_blink));
        Blink.connect (sigc::mem_fun(*this, &ARDOUR_UI::audition_blink));
+       Blink.connect (sigc::mem_fun(*this, &ARDOUR_UI::feedback_blink));
 
-       /* these are all need to be handled in an RT-safe and MT way, so don't
-          do any GUI work, just queue it for handling by the GUI thread.
-       */
-
-       session->TransportStateChange.connect (sigc::mem_fun(*this, &ARDOUR_UI::map_transport_state));
-
-       /* alert the user to these things happening */
-
-       session->AuditionActive.connect (sigc::mem_fun(*this, &ARDOUR_UI::auditioning_changed));
-       session->SoloActive.connect (sigc::mem_fun(*this, &ARDOUR_UI::soloing_changed));
+       _session->RecordStateChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::record_state_changed, this), gui_context());
+       _session->StepEditStatusChange.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::step_edit_status_change, this, _1), gui_context());
+       _session->TransportStateChange.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::map_transport_state, this), gui_context());
+       _session->DirtyChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::update_autosave, this), gui_context());
 
-       solo_alert_button.set_active (session->soloing());
-
-       /* update autochange callback on dirty state changing */
-
-       session->DirtyChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::update_autosave));
-
-       /* can't be auditioning here */
-
-       primary_clock.set_session (s);
-       secondary_clock.set_session (s);
-       big_clock.set_session (s);
-       preroll_clock.set_session (s);
-       postroll_clock.set_session (s);
+       _session->Xrun.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::xrun_handler, this, _1), gui_context());
+       _session->SoloActive.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::soloing_changed, this, _1), gui_context());
+       _session->AuditionActive.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::auditioning_changed, this, _1), gui_context());
+       _session->locations()->added.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::handle_locations_change, this, _1), gui_context());
+       _session->locations()->removed.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::handle_locations_change, this, _1), gui_context());
+       _session->config.ParameterChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_parameter_changed, this, _1), gui_context ());
 
        /* Clocks are on by default after we are connected to a session, so show that here.
        */
@@ -154,20 +186,76 @@ ARDOUR_UI::connect_to_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);
-       point_zero_one_second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_zero_one_seconds), 40);
+       point_zero_something_second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_zero_something_seconds), 40);
+
+       update_format ();
+
+       if (editor_meter) {
+               meter_box.remove(*editor_meter);
+               delete editor_meter;
+               editor_meter = 0;
+               editor_meter_peak_display.hide();
+       }
+
+       if (_session
+                       && _session->master_out()
+                       && _session->master_out()->n_outputs().n(DataType::AUDIO) > 0) {
+               editor_meter = new LevelMeterHBox(_session);
+               editor_meter->set_meter (_session->master_out()->shared_peak_meter().get());
+               editor_meter->clear_meters();
+               editor_meter->set_type (_session->master_out()->meter_type());
+               editor_meter->setup_meters (30, 12, 6);
+               editor_meter->show();
+               meter_box.pack_start(*editor_meter);
+
+               ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display));
+               ArdourMeter::ResetRoutePeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_route_peak_display));
+               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_max_peak = -INFINITY;
+               editor_meter_peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::editor_meter_peak_button_release), false);
+
+               if (Config->get_show_editor_meter()) {
+                       transport_tearoff_hbox.pack_start (meter_box, false, false);
+                       transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false);
+                       meter_box.show();
+                       editor_meter_peak_display.show();
+               } else if (meter_box.get_parent()) {
+                       transport_tearoff_hbox.remove (meter_box);
+                       transport_tearoff_hbox.remove (editor_meter_peak_display);
+               }
+       } else if (meter_box.get_parent()) {
+               transport_tearoff_hbox.remove (meter_box);
+               transport_tearoff_hbox.remove (editor_meter_peak_display);
+       }
+
 }
 
 int
 ARDOUR_UI::unload_session (bool hide_stuff)
 {
-       if (session && session->dirty()) {
-               switch (ask_about_saving_session (_("close"))) {
+       if (_session) {
+               ARDOUR_UI::instance()->video_timeline->sync_session_state();
+       }
+
+       if (_session && _session->dirty()) {
+               std::vector<std::string> actions;
+               actions.push_back (_("Don't close"));
+               actions.push_back (_("Just close"));
+               actions.push_back (_("Save and close"));
+               switch (ask_about_saving_session (actions)) {
                case -1:
                        // cancel
                        return 1;
 
                case 1:
-                       session->save_state ("");
+                       _session->save_state ("");
                        break;
                }
        }
@@ -175,18 +263,33 @@ ARDOUR_UI::unload_session (bool hide_stuff)
        if (hide_stuff) {
                editor->hide ();
                mixer->hide ();
+               meterbridge->hide ();
                theme_manager->hide ();
+               audio_port_matrix->hide();
+               midi_port_matrix->hide();
+               route_params->hide();
        }
 
        second_connection.disconnect ();
        point_one_second_connection.disconnect ();
-       point_oh_five_second_connection.disconnect ();
-       point_zero_one_second_connection.disconnect();
+       point_zero_something_second_connection.disconnect();
+
+       if (editor_meter) {
+               meter_box.remove(*editor_meter);
+               delete editor_meter;
+               editor_meter = 0;
+               editor_meter_peak_display.hide();
+       }
 
        ActionManager::set_sensitive (ActionManager::session_sensitive_actions, false);
 
        rec_button.set_sensitive (false);
-       shuttle_box.set_sensitive (false);
+
+       WM::Manager::instance().set_session ((ARDOUR::Session*) 0);
+
+       if (ARDOUR_UI::instance()->video_timeline) {
+               ARDOUR_UI::instance()->video_timeline->close_session();
+       }
 
        stop_blinking ();
        stop_clocking ();
@@ -195,210 +298,233 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 
        Blink.clear ();
 
-       primary_clock.set_session (0);
-       secondary_clock.set_session (0);
-       big_clock.set_session (0);
-       preroll_clock.set_session (0);
-       postroll_clock.set_session (0);
+       delete _session;
+       _session = 0;
 
-       delete session;
-       session = 0;
+       session_loaded = false;
 
        update_buffer_load ();
 
        return 0;
 }
 
-void
-ARDOUR_UI::toggle_big_clock_window ()
+static bool
+_hide_splash (gpointer arg)
 {
-       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleBigClock"));
-       if (act) {
-               RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
-
-               if (tact->get_active()) {
-                       big_clock_window->show_all ();
-                       big_clock_window->present ();
-               } else {
-                       big_clock_window->hide ();
-               }
-       }
+       ((ARDOUR_UI*)arg)->hide_splash();
+       return false;
 }
 
 void
-ARDOUR_UI::toggle_rc_options_window ()
+ARDOUR_UI::goto_editor_window ()
 {
-       if (rc_option_editor == 0) {
-               rc_option_editor = new RCOptionEditor;
-               rc_option_editor->signal_unmap().connect(sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleRCOptionsEditor")));
-               rc_option_editor->set_session (session);
+       if (splash && splash->is_visible()) {
+               // in 2 seconds, hide the splash screen
+               Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 2000);
        }
 
-       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleRCOptionsEditor"));
-       if (act) {
-               RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
-
-               if (tact->get_active()) {
-                       rc_option_editor->show_all ();
-                       rc_option_editor->present ();
-               } else {
-                       rc_option_editor->hide ();
-               }
-       }
+       editor->show_window ();
+       editor->present ();
+       /* mixer should now be on top */
+       WM::Manager::instance().set_transient_for (editor);
+       _mixer_on_top = false;
 }
 
 void
-ARDOUR_UI::toggle_session_options_window ()
+ARDOUR_UI::goto_mixer_window ()
 {
-       if (session_option_editor == 0) {
-               session_option_editor = new SessionOptionEditor (session);
-               session_option_editor->signal_unmap().connect(sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleSessionOptionsEditor")));
+       Glib::RefPtr<Gdk::Window> win;
+       Glib::RefPtr<Gdk::Screen> screen;
+       
+       if (editor) {
+               win = editor->get_window ();
        }
 
-       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleSessionOptionsEditor"));
-       if (act) {
-               RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
-
-               if (tact->get_active()) {
-                       session_option_editor->show_all ();
-                       session_option_editor->present ();
-               } else {
-                       session_option_editor->hide ();
-               }
+       if (win) {
+               screen = win->get_screen();
+       } else {
+               screen = Gdk::Screen::get_default();
        }
-}
-
-int
-ARDOUR_UI::create_location_ui ()
-{
-       if (location_ui == 0) {
-               location_ui = new LocationUIWindow ();
-               location_ui->set_session (session);
-               location_ui->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleLocations")));
+       
+       if (g_getenv ("ARDOUR_LOVES_STUPID_TINY_SCREENS") == 0 && screen && screen->get_height() < 700) {
+               Gtk::MessageDialog msg (_("This screen is not tall enough to display the mixer window"));
+               msg.run ();
+               return;
        }
-       return 0;
+
+       mixer->show_window ();
+       mixer->present ();
+       /* mixer should now be on top */
+       WM::Manager::instance().set_transient_for (mixer);
+       _mixer_on_top = true;
 }
 
 void
-ARDOUR_UI::toggle_location_window ()
+ARDOUR_UI::toggle_mixer_window ()
 {
-       if (create_location_ui()) {
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("toggle-mixer"));
+       if (!act) {
                return;
        }
 
-       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleLocations"));
-       if (act) {
-               RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
 
-               if (tact->get_active()) {
-                       location_ui->show_all ();
-                       location_ui->present ();
-               } else {
-                       location_ui->hide ();
-               }
+       if (tact->get_active()) {
+               goto_mixer_window ();
+       } else {
+               mixer->hide ();
        }
 }
 
 void
-ARDOUR_UI::toggle_key_editor ()
+ARDOUR_UI::toggle_meterbridge ()
 {
-       if (key_editor == 0) {
-               key_editor = new KeyEditor;
-               key_editor->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleKeyEditor")));
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("toggle-meterbridge"));
+       if (!act) {
+               return;
        }
 
-       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleKeyEditor"));
-       if (act) {
-               RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
 
-               if (tact->get_active()) {
-                       key_editor->show_all ();
-                       key_editor->present ();
-               } else {
-                       key_editor->hide ();
-               }
+       if (tact->get_active()) {
+               meterbridge->show_window ();
+       } else {
+               meterbridge->hide_window (NULL);
        }
 }
 
 void
-ARDOUR_UI::toggle_theme_manager ()
+ARDOUR_UI::toggle_editor_mixer ()
 {
-       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleThemeManager"));
-       if (act) {
-               RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
-
-               if (tact->get_active()) {
-                       theme_manager->show_all ();
-                       theme_manager->present ();
+       bool obscuring = false;
+       /* currently, if windows are on different
+          screens then we do nothing; but in the
+          future we may want to bring the window 
+          to the front or something, so I'm leaving this 
+          variable for future use
+       */
+        bool same_screen = true; 
+       
+        if (editor && mixer) {
+
+               /* remeber: Screen != Monitor (Screen is a separately rendered
+                * continuous geometry that make include 1 or more monitors.
+                */
+               
+                if (editor->get_screen() != mixer->get_screen() && (mixer->get_screen() != 0) && (editor->get_screen() != 0)) {
+                        // different screens, so don't do anything
+                        same_screen = false;
+                } else {
+                        // they are on the same screen, see if they are obscuring each other
+
+                        gint ex, ey, ew, eh;
+                        gint mx, my, mw, mh;
+
+                        editor->get_position (ex, ey);
+                        editor->get_size (ew, eh);
+
+                        mixer->get_position (mx, my);
+                        mixer->get_size (mw, mh);
+
+                        GdkRectangle e;
+                        GdkRectangle m;
+                        GdkRectangle r;
+
+                        e.x = ex;
+                        e.y = ey;
+                        e.width = ew;
+                        e.height = eh;
+
+                        m.x = mx;
+                        m.y = my;
+                        m.width = mw;
+                        m.height = mh;
+
+                       if (gdk_rectangle_intersect (&e, &m, &r)) {
+                                obscuring = true;
+                        }
+                }
+        }
+
+        if (mixer && !mixer->not_visible() && mixer->property_has_toplevel_focus()) {
+                if (obscuring && same_screen) {
+                        goto_editor_window();
+                }
+        } else if (editor && !editor->not_visible() && editor->property_has_toplevel_focus()) {
+                if (obscuring && same_screen) {
+                        goto_mixer_window();
+                }
+        } else if (mixer && mixer->not_visible()) {
+                if (obscuring && same_screen) {
+                        goto_mixer_window ();
+                }
+        } else if (editor && editor->not_visible()) {
+                if (obscuring && same_screen) {
+                        goto_editor_window ();
+                }
+        } else if (obscuring && same_screen) {
+                //it's unclear what to do here, so just do the opposite of what we did last time  (old behavior)
+                if (_mixer_on_top) {
+                       goto_editor_window ();
                } else {
-                       theme_manager->hide ();
+                       goto_mixer_window ();
                }
-       }
+        }
 }
 
 void
-ARDOUR_UI::create_bundle_manager ()
+ARDOUR_UI::new_midi_tracer_window ()
 {
-       if (bundle_manager == 0) {
-               bundle_manager = new BundleManager (session);
-               bundle_manager->signal_unmap().connect (sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBundleManager")));
+       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("NewMIDITracer"));
+       if (!act) {
+               return;
        }
-}
 
-void
-ARDOUR_UI::toggle_bundle_manager ()
-{
-       create_bundle_manager ();
-
-       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleBundleManager"));
-       if (act) {
-               RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
+       std::list<MidiTracer*>::iterator i = _midi_tracer_windows.begin ();
+       while (i != _midi_tracer_windows.end() && (*i)->get_visible() == true) {
+               ++i;
+       }
 
-               if (tact->get_active()) {
-                       bundle_manager->show_all ();
-                       bundle_manager->present ();
-               } else {
-                       bundle_manager->hide ();
-               }
+       if (i == _midi_tracer_windows.end()) {
+               /* all our MIDITracer windows are visible; make a new one */
+               MidiTracer* t = new MidiTracer ();
+               t->show_all ();
+               _midi_tracer_windows.push_back (t);
+       } else {
+               /* re-use the hidden one */
+               (*i)->show_all ();
        }
 }
 
-int
-ARDOUR_UI::create_route_params ()
+BundleManager*
+ARDOUR_UI::create_bundle_manager ()
 {
-       if (route_params == 0) {
-               route_params = new RouteParams_UI ();
-               route_params->set_session (session);
-               route_params->signal_unmap().connect (sigc::bind(sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleInspector")));
-       }
-       return 0;
+       return new BundleManager (_session);
 }
 
-void
-ARDOUR_UI::toggle_route_params_window ()
+AddVideoDialog*
+ARDOUR_UI::create_add_video_dialog ()
 {
-       if (create_route_params ()) {
-               return;
-       }
+       return new AddVideoDialog (_session);
+}
 
-       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleInspector"));
-       if (act) {
-               RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
+SessionOptionEditor*
+ARDOUR_UI::create_session_option_editor ()
+{
+       return new SessionOptionEditor (_session);
+}
 
-               if (tact->get_active()) {
-                       route_params->show_all ();
-                       route_params->present ();
-               } else {
-                       route_params->hide ();
-               }
-       }
+BigClockWindow*
+ARDOUR_UI::create_big_clock_window ()
+{
+       return new BigClockWindow (*big_clock);
 }
 
 void
 ARDOUR_UI::handle_locations_change (Location *)
 {
-       if (session) {
-               if (session->locations()->num_range_markers()) {
+       if (_session) {
+               if (_session->locations()->num_range_markers()) {
                        ActionManager::set_sensitive (ActionManager::range_sensitive_actions, true);
                } else {
                        ActionManager::set_sensitive (ActionManager::range_sensitive_actions, false);
@@ -413,16 +539,35 @@ ARDOUR_UI::main_window_state_event_handler (GdkEventWindowState* ev, bool window
 
                if ((ev->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) &&
                    (ev->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {
-                       float_big_clock (editor);
+                       if (big_clock_window) {
+                               big_clock_window->set_transient_for (*editor);
+                       }
                }
 
        } else {
 
                if ((ev->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) &&
                    (ev->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {
-                       float_big_clock (mixer);
+                       if (big_clock_window) {
+                               big_clock_window->set_transient_for (*mixer);
+                       }
                }
        }
 
        return false;
 }
+
+bool
+ARDOUR_UI::editor_meter_peak_button_release (GdkEventButton* ev)
+{
+       if (ev->button == 1 && Gtkmm2ext::Keyboard::modifier_state_equals (ev->state, Gtkmm2ext::Keyboard::PrimaryModifier|Gtkmm2ext::Keyboard::TertiaryModifier)) {
+               ArdourMeter::ResetAllPeakDisplays ();
+       } else if (ev->button == 1 && Gtkmm2ext::Keyboard::modifier_state_equals (ev->state, Gtkmm2ext::Keyboard::PrimaryModifier)) {
+               if (_session->master_out()) {
+                       ArdourMeter::ResetGroupPeakDisplays (_session->master_out()->route_group());
+               }
+       } else if (_session->master_out()) {
+               ArdourMeter::ResetRoutePeakDisplays (_session->master_out().get());
+       }
+       return true;
+}