copy contents of analysis, plugins, automation and externals folders during save-as

[ardour.git] / gtk2_ardour / main_clock.cc

diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc
index f90599de1374e6675a636e0188305e2ccefc4850..f0cbd9bf289732d94804c4eb673c50dc42039319 100644 (file)
--- a/gtk2_ardour/main_clock.cc
+++ b/gtk2_ardour/main_clock.cc
@@ -73,7 +73,7 @@ MainClock::absolute_time () const
 {
        if (get_is_duration ()) {
                // delta to edit cursor
-               return current_time () + PublicEditor::instance().get_preferred_edit_position (true);
+               return current_time () + PublicEditor::instance().get_preferred_edit_position (Editing::EDIT_IGNORE_PHEAD);
        } else {
                return current_time ();
        }
@@ -99,8 +99,7 @@ MainClock::edit_current_tempo ()
 void
 MainClock::edit_current_meter ()
 {
-       ARDOUR::Meter m = PublicEditor::instance().session()->tempo_map().meter_at (absolute_time());
-       ARDOUR::MeterSection ms (absolute_time(), m.divisions_per_bar(), m.note_divisor());
+       ARDOUR::MeterSection ms = PublicEditor::instance().session()->tempo_map().meter_section_at (absolute_time());
        PublicEditor::instance().edit_meter_section (&ms);
 }