new_grid: The Return of the snap_to_X functions.

[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 561fff520cbabdd293d83465d9c307adb390c6d8..aabfbfd0beced7d0384cf282cf6c6125cacc1cd0 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"
@@ -43,6 +45,7 @@
 #include "add_video_dialog.h"
 #include "ardour_ui.h"
 #include "big_clock_window.h"
+#include "big_transport_window.h"
 #include "bundle_manager.h"
 #include "global_port_matrix.h"
 #include "gui_object.h"
@@ -77,12 +80,19 @@ using namespace PBD;
 using namespace Glib;
 using namespace Gtk;
 using namespace Gtkmm2ext;
+using namespace ArdourWidgets;
 
 void
 ARDOUR_UI::set_session (Session *s)
 {
        SessionHandlePtr::set_session (s);
 
+       transport_ctrl.set_session (s);
+
+       if (big_transport_window) {
+               big_transport_window->set_session (s);
+       }
+
        if (!_session) {
                WM::Manager::instance().set_session (s);
                /* Session option editor cannot exist across change-of-session */
@@ -147,12 +157,14 @@ 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);
 
-       rec_button.set_sensitive (true);
-
        solo_alert_button.set_active (_session->soloing());
 
        setup_session_options ();
@@ -162,7 +174,6 @@ ARDOUR_UI::set_session (Session *s)
        _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());
        _session->DirtyChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_dirty_changed, this), gui_context());
 
@@ -172,7 +183,6 @@ 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.
        */
@@ -199,21 +209,19 @@ ARDOUR_UI::set_session (Session *s)
 
        update_format ();
 
-       if (meter_box.get_parent()) {
-               transport_hbox.remove (meter_box);
-               transport_hbox.remove (editor_meter_peak_display);
+       if (editor_meter_table.get_parent()) {
+               transport_hbox.remove (editor_meter_table);
        }
 
        if (editor_meter) {
-               meter_box.remove(*editor_meter);
+               editor_meter_table.remove(*editor_meter);
                delete editor_meter;
                editor_meter = 0;
                editor_meter_peak_display.hide();
        }
 
-       if (meter_box.get_parent()) {
-               transport_hbox.remove (meter_box);
-               transport_hbox.remove (editor_meter_peak_display);
+       if (editor_meter_table.get_parent()) {
+               transport_hbox.remove (editor_meter_table);
        }
 
        if (_session &&
@@ -224,10 +232,17 @@ 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->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));
+
+                       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();
                }
 
                ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display));
@@ -236,7 +251,7 @@ ARDOUR_UI::set_session (Session *s)
 
                editor_meter_peak_display.set_name ("meterbridge peakindicator");
                editor_meter_peak_display.unset_flags (Gtk::CAN_FOCUS);
-               editor_meter_peak_display.set_size_request (std::max(9.f, rintf(8.f * UIConfiguration::instance().get_ui_scale())), -1);
+               editor_meter_peak_display.set_size_request (-1, std::max(6.f, rintf(5.f * UIConfiguration::instance().get_ui_scale())) );
                editor_meter_peak_display.set_corner_radius (3.0);
 
                editor_meter_max_peak = -INFINITY;
@@ -282,6 +297,7 @@ ARDOUR_UI::unload_session (bool hide_stuff)
        }
 
        if (hide_stuff) {
+               close_all_dialogs ();
                editor->hide ();
                mixer->hide ();
                meterbridge->hide ();
@@ -296,7 +312,7 @@ ARDOUR_UI::unload_session (bool hide_stuff)
        fps_connection.disconnect();
 
        if (editor_meter) {
-               meter_box.remove(*editor_meter);
+               editor_meter_table.remove(*editor_meter);
                delete editor_meter;
                editor_meter = 0;
                editor_meter_peak_display.hide();
@@ -304,8 +320,6 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 
        ActionManager::set_sensitive (ActionManager::session_sensitive_actions, false);
 
-       rec_button.set_sensitive (false);
-
        WM::Manager::instance().set_session ((ARDOUR::Session*) 0);
 
        if (ARDOUR_UI::instance()->video_timeline) {
@@ -323,7 +337,6 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 
        session_loaded = false;
 
-       update_buffer_load ();
        update_title ();
 
        return 0;
@@ -862,6 +875,14 @@ ARDOUR_UI::create_big_clock_window ()
        return new BigClockWindow (*big_clock);
 }
 
+BigTransportWindow*
+ARDOUR_UI::create_big_transport_window ()
+{
+       BigTransportWindow* btw = new BigTransportWindow ();
+       btw->set_session (_session);
+       return btw;
+}
+
 void
 ARDOUR_UI::handle_locations_change (Location *)
 {
@@ -884,6 +905,9 @@ ARDOUR_UI::tabbed_window_state_event_handler (GdkEventWindowState* ev, void* obj
                        if (big_clock_window) {
                                big_clock_window->set_transient_for (*editor->own_window());
                        }
+                       if (big_transport_window) {
+                               big_transport_window->set_transient_for (*editor->own_window());
+                       }
                }
 
        } else if (object == mixer) {
@@ -893,6 +917,9 @@ ARDOUR_UI::tabbed_window_state_event_handler (GdkEventWindowState* ev, void* obj
                        if (big_clock_window) {
                                big_clock_window->set_transient_for (*mixer->own_window());
                        }
+                       if (big_transport_window) {
+                               big_transport_window->set_transient_for (*mixer->own_window());
+                       }
                }
        }