when calculating average slave/master delta, use absolute value.

[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 e74ee8fa0495b32c4ec08f02e42f4ff042712317..8f1d080009a0195ae947d5cb5d3d7983192c90eb 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -25,6 +25,8 @@
 
 #include <vector>
 
+#include <gtkmm/treemodelfilter.h>
+
 #include "pbd/convert.h"
 
 #include "ardour/audioengine.h"
@@ -56,6 +58,7 @@
 #include "meter_patterns.h"
 #include "monitor_section.h"
 #include "midi_tracer.h"
+#include "mini_timeline.h"
 #include "mixer_ui.h"
 #include "public_editor.h"
 #include "processor_box.h"
@@ -66,17 +69,17 @@
 #include "speaker_dialog.h"
 #include "splash.h"
 #include "sfdb_ui.h"
-#include "theme_manager.h"
 #include "time_info_box.h"
 #include "timers.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Glib;
 using namespace Gtk;
 using namespace Gtkmm2ext;
+using namespace ArdourWidgets;
 
 void
 ARDOUR_UI::set_session (Session *s)
@@ -108,15 +111,15 @@ ARDOUR_UI::set_session (Session *s)
 
        AutomationWatch::instance().set_session (s);
 
-       if (shuttle_box) {
-               shuttle_box->set_session (s);
-       }
+       shuttle_box.set_session (s);
+       mini_timeline.set_session (s);
+       time_info_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);
+       lua_script_window->set_session (s);
 
        /* sensitize menu bar options that are now valid */
 
@@ -147,6 +150,10 @@ ARDOUR_UI::set_session (Session *s)
 
        ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, false);
+       ActionManager::set_sensitive (ActionManager::route_selection_sensitive_actions, false);
+       ActionManager::set_sensitive (ActionManager::bus_selection_sensitive_actions, false);
+       ActionManager::set_sensitive (ActionManager::vca_selection_sensitive_actions, false);
+       ActionManager::set_sensitive (ActionManager::stripable_selection_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::line_selection_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::point_selection_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::playlist_selection_sensitive_actions, false);
@@ -160,6 +167,7 @@ ARDOUR_UI::set_session (Session *s)
        blink_connection = Timers::blink_connect (sigc::mem_fun(*this, &ARDOUR_UI::blink_handler));
 
        _session->SaveSessionRequested.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::save_session_at_its_request, this, _1), gui_context());
+       _session->StateSaved.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::update_title, this), gui_context());
        _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());
@@ -171,6 +179,7 @@ ARDOUR_UI::set_session (Session *s)
        _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 ());
+       _session->auto_loop_location_changed.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::set_loop_sensitivity, this), gui_context ());
 
        /* Clocks are on by default after we are connected to a session, so show that here.
        */
@@ -222,10 +231,12 @@ ARDOUR_UI::set_session (Session *s)
                        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->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));
                }
 
                ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display));
@@ -240,12 +251,7 @@ ARDOUR_UI::set_session (Session *s)
                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 (UIConfiguration::instance().get_show_editor_meter() && !ARDOUR::Profile->get_trx()) {
-                       transport_hbox.pack_start (meter_box, false, false);
-                       transport_hbox.pack_start (editor_meter_peak_display, false, false);
-                       meter_box.show();
-                       editor_meter_peak_display.show();
-               }
+               repack_transport_hbox ();
        }
 
        update_title ();
@@ -285,6 +291,7 @@ ARDOUR_UI::unload_session (bool hide_stuff)
        }
 
        if (hide_stuff) {
+               close_all_dialogs ();
                editor->hide ();
                mixer->hide ();
                meterbridge->hide ();
@@ -342,7 +349,8 @@ ARDOUR_UI::toggle_editor_and_mixer ()
                } else if (_tabs.get_current_page() == _tabs.page_num (mixer->contents())) {
                        _tabs.set_current_page (_tabs.page_num (editor->contents()));
                } else {
-                       /* do nothing */
+                       /* go to mixer */
+                       _tabs.set_current_page (_tabs.page_num (mixer->contents()));
                }
                return;
        }