Use rectangle intersection for MIDI note rect select.

[ardour.git] / gtk2_ardour / location_ui.cc

diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 60e0be567667fdf276853f23aa7417d6121dcd24..30a5b62426dc422e97fe632d00ea377974eb8467 100644 (file)
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -22,13 +22,12 @@
 
 #include <gtkmm2ext/utils.h>
 
-#include "ardour/utils.h"
-#include "ardour/configuration.h"
 #include "ardour/session.h"
 #include "pbd/memento_command.h"
 
 #include "ardour_ui.h"
 #include "clock_group.h"
+#include "main_clock.h"
 #include "gui_thread.h"
 #include "keyboard.h"
 #include "location_ui.h"
@@ -62,6 +61,9 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
 
          remove_button.set_image (*manage (new Image (Stock::REMOVE, Gtk::ICON_SIZE_MENU)));
 
+        start_to_playhead_button.set_name ("LocationEditCdButton");
+        end_to_playhead_button.set_name ("LocationEditCdButton");
+
          number_label.set_name ("LocationEditNumberLabel");
          name_label.set_name ("LocationEditNameLabel");
          name_entry.set_name ("LocationEditNameEntry");
@@ -324,7 +326,7 @@ LocationEditRow::set_location (Location *loc)
                length_clock.hide();
        }
 
-       set_clock_sensitivity ();
+       set_clock_editable_status ();
 
        --i_am_the_modifier;
 
@@ -634,7 +636,7 @@ LocationEditRow::location_changed (ARDOUR::Location*)
        end_clock.set (location->end());
        length_clock.set (location->length());
 
-       set_clock_sensitivity ();
+       set_clock_editable_status ();
 
        i_am_the_modifier--;
 
@@ -667,7 +669,7 @@ LocationEditRow::lock_changed (ARDOUR::Location*)
 
        lock_check_button.set_active (location->locked());
 
-       set_clock_sensitivity ();
+       set_clock_editable_status ();
 
        i_am_the_modifier--;
 }
@@ -687,16 +689,17 @@ LocationEditRow::position_lock_style_changed (ARDOUR::Location*)
 }
 
 void
-LocationEditRow::focus_name() {
-       name_entry.grab_focus();
+LocationEditRow::focus_name()
+{
+       name_entry.grab_focus ();
 }
 
 void
-LocationEditRow::set_clock_sensitivity ()
+LocationEditRow::set_clock_editable_status ()
 {
-       start_clock.set_sensitive (!location->locked());
-       end_clock.set_sensitive (!location->locked());
-       length_clock.set_sensitive (!location->locked());
+       start_clock.set_editable (!location->locked());
+       end_clock.set_editable (!location->locked());
+       length_clock.set_editable (!location->locked());
 }
 
 /*------------------------------------------------------------------------*/
@@ -862,9 +865,9 @@ LocationUI::location_redraw_ranges ()
 }
 
 struct LocationSortByStart {
-    bool operator() (Location *a, Location *b) {
-           return a->start() < b->start();
-    }
+       bool operator() (Location *a, Location *b) {
+               return a->start() < b->start();
+       }
 };
 
 void
@@ -879,7 +882,7 @@ LocationUI::location_added (Location* location)
                loc.sort (LocationSortByStart ());
 
                LocationEditRow* erow = manage (new LocationEditRow (_session, location));
-
+               
                 erow->set_clock_group (*_clock_group);
                erow->remove_requested.connect (sigc::mem_fun (*this, &LocationUI::location_remove_requested));
 
@@ -910,6 +913,11 @@ LocationUI::location_added (Location* location)
 
                range_rows.show_all ();
                location_rows.show_all ();
+
+               if (location == newest_location) {
+                       newest_location = 0;
+                       erow->focus_name();
+               }
        }
 }
 
@@ -959,10 +967,6 @@ LocationUI::map_locations (Locations::LocationList& locations)
 
                         Box_Helpers::BoxList & loc_children = location_rows.children();
                        loc_children.push_back(Box_Helpers::Element(*erow, PACK_SHRINK, 1, PACK_START));
-                       if (location == newest_location) {
-                               newest_location = 0;
-                               erow->focus_name();
-                       }
                } else if (location->is_auto_punch()) {
                        punch_edit_row.set_session (_session);
                        punch_edit_row.set_location (location);
@@ -1117,7 +1121,7 @@ LocationUI::clock_mode_from_session_instant_xml () const
 
        XMLProperty* p = node->property (X_("clock-mode"));
        if (!p) {
-               return AudioClock::Frames;
+               return ARDOUR_UI::instance()->secondary_clock->mode();
        }
              
        return (AudioClock::Mode) string_2_enum (p->value (), AudioClock::Mode);