Use labs() for long instead of abs()

[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 f5cf855843179f9561b6f50793681d114c225a23..8625b92210b56710045700325ac15c2a7640b15b 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -82,6 +82,7 @@
 #include "time_info_box.h"
 #include "timers.h"
 #include "transport_masters_dialog.h"
+#include "virtual_keyboard_window.h"
 
 #include "pbd/i18n.h"
 
@@ -103,6 +104,10 @@ ARDOUR_UI::set_session (Session *s)
                big_transport_window->set_session (s);
        }
 
+       if (virtual_keyboard_window) {
+               virtual_keyboard_window->set_session (s);
+       }
+
        if (!_session) {
                WM::Manager::instance().set_session (s);
                /* Session option editor cannot exist across change-of-session */
@@ -190,6 +195,9 @@ ARDOUR_UI::set_session (Session *s)
        _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 ());
 
+       _session->LatencyUpdated.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_latency_updated, this), gui_context());
+       session_latency_updated ();
+
        /* Clocks are on by default after we are connected to a session, so show that here.
        */
 
@@ -234,20 +242,18 @@ ARDOUR_UI::set_session (Session *s)
            _session->master_out() &&
            _session->master_out()->n_outputs().n(DataType::AUDIO) > 0) {
 
-               if (!ARDOUR::Profile->get_trx()) {
-                       editor_meter = new LevelMeterHBox(_session);
-                       editor_meter->set_meter (_session->master_out()->shared_peak_meter().get());
-                       editor_meter->clear_meters();
-                       editor_meter->setup_meters (30, 10, 6);
-                       editor_meter->show();
+               editor_meter = new LevelMeterHBox(_session);
+               editor_meter->set_meter (_session->master_out()->shared_peak_meter().get());
+               editor_meter->clear_meters();
+               editor_meter->setup_meters (30, 10, 6);
+               editor_meter->show();
 
-                       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_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();
-               }
+               editor_meter->show();
+               editor_meter_peak_display.show();
 
                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));
@@ -886,6 +892,14 @@ ARDOUR_UI::create_big_transport_window ()
        return btw;
 }
 
+VirtualKeyboardWindow*
+ARDOUR_UI::create_virtual_keyboard_window ()
+{
+       VirtualKeyboardWindow* vkbd = new VirtualKeyboardWindow ();
+       vkbd->set_session (_session);
+       return vkbd;
+}
+
 void
 ARDOUR_UI::handle_locations_change (Location *)
 {
@@ -911,6 +925,9 @@ ARDOUR_UI::tabbed_window_state_event_handler (GdkEventWindowState* ev, void* obj
                        if (big_transport_window) {
                                big_transport_window->set_transient_for (*editor->own_window());
                        }
+                       if (virtual_keyboard_window) {
+                               virtual_keyboard_window->set_transient_for (*editor->own_window());
+                       }
                }
 
        } else if (object == mixer) {
@@ -923,6 +940,9 @@ ARDOUR_UI::tabbed_window_state_event_handler (GdkEventWindowState* ev, void* obj
                        if (big_transport_window) {
                                big_transport_window->set_transient_for (*mixer->own_window());
                        }
+                       if (virtual_keyboard_window) {
+                               virtual_keyboard_window->set_transient_for (*mixer->own_window());
+                       }
                }
        }