Merge branch 'master' into windows

[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 4ed563e2017bb650b329d7c31809a16167b9f1e9..bca762569fa269cef640157399b0c23f57916404 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -27,6 +27,10 @@
 #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"
@@ -39,6 +43,7 @@
 #include "keyeditor.h"
 #include "location_ui.h"
 #include "main_clock.h"
+#include "meter_patterns.h"
 #include "midi_tracer.h"
 #include "mixer_ui.h"
 #include "public_editor.h"
@@ -52,6 +57,8 @@
 #include "theme_manager.h"
 #include "time_info_box.h"
 
+#include <gtkmm2ext/keyboard.h>
+
 #include "i18n.h"
 
 using namespace ARDOUR;
@@ -65,9 +72,9 @@ ARDOUR_UI::set_session (Session *s)
 {
        SessionHandlePtr::set_session (s);
 
-       WM::Manager::instance().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 */
@@ -87,6 +94,8 @@ ARDOUR_UI::set_session (Session *s)
                }
        }
 
+       WM::Manager::instance().set_session (s);
+
        AutomationWatch::instance().set_session (s);
 
        if (shuttle_box) {
@@ -181,9 +190,48 @@ 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);
-       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()) {
+               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()) {
+                       meter_box.show();
+                       editor_meter_peak_display.show();
+               } else {
+                       meter_box.hide();
+                       editor_meter_peak_display.hide();
+               }
+       }
+
 }
 
 int
@@ -212,6 +260,7 @@ 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();
@@ -220,13 +269,20 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 
        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);
 
+       WM::Manager::instance().set_session ((ARDOUR::Session*) 0);
        ARDOUR_UI::instance()->video_timeline->close_session();
 
        stop_blinking ();
@@ -327,7 +383,7 @@ ARDOUR_UI::toggle_meterbridge ()
        if (tact->get_active()) {
                meterbridge->show_window ();
        } else {
-               meterbridge->hide ();
+               meterbridge->hide_window (NULL);
        }
 }
 
@@ -494,3 +550,18 @@ ARDOUR_UI::main_window_state_event_handler (GdkEventWindowState* ev, bool window
 
        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;
+}