various work waveview amplitude mgmt; fix playhead cursor drag from timebar click

[ardour.git] / gtk2_ardour / location_ui.cc

diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 9f027ea8bf262ba5d14b7135c7cc835692d04d89..30a5b62426dc422e97fe632d00ea377974eb8467 100644 (file)
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -27,6 +27,7 @@
 
 #include "ardour_ui.h"
 #include "clock_group.h"
+#include "main_clock.h"
 #include "gui_thread.h"
 #include "keyboard.h"
 #include "location_ui.h"
@@ -60,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");
@@ -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);