diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2018-10-10 11:47:05 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2018-10-10 11:47:29 -0400 |
| commit | 0542a3090182fa97bd355ef876cf1918408e32b0 (patch) | |
| tree | 666471a1f62687e6a4960a5c6d63027ace6b6aa9 /gtk2_ardour/editor_regions.cc | |
| parent | 7d5eed09142ef5805c31940f563b43e87290ba62 (diff) | |
use primary, not secondary, clock mode to drive other clock modes, and dynamically update region editors, location UI and editor regions when it changes
Diffstat (limited to 'gtk2_ardour/editor_regions.cc')
| -rw-r--r-- | gtk2_ardour/editor_regions.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index 4dd037dee0..89ecaf13b3 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -262,7 +262,7 @@ EditorRegions::EditorRegions (Editor* e) // _display.signal_popup_menu().connect (sigc::bind (sigc::mem_fun (*this, &Editor::show__display_context_menu), 1, 0)); //ARDOUR_UI::instance()->secondary_clock.mode_changed.connect (sigc::mem_fun(*this, &Editor::redisplay_regions)); - ARDOUR_UI::instance()->secondary_clock->mode_changed.connect (sigc::mem_fun(*this, &EditorRegions::update_all_rows)); + ARDOUR_UI::instance()->primary_clock->mode_changed.connect (sigc::mem_fun(*this, &EditorRegions::update_all_rows)); ARDOUR::Region::RegionPropertyChanged.connect (region_property_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::region_changed, this, _1, _2), gui_context()); ARDOUR::RegionFactory::CheckNewRegion.connect (check_new_region_connection, MISSING_INVALIDATOR, boost::bind (&EditorRegions::add_region, this, _1), gui_context()); @@ -747,7 +747,7 @@ EditorRegions::format_position (samplepos_t pos, char* buf, size_t bufsize, bool return; } - switch (ARDOUR_UI::instance()->secondary_clock->mode ()) { + switch (ARDOUR_UI::instance()->primary_clock->mode ()) { case AudioClock::BBT: bbt = _session->tempo_map().bbt_at_sample (pos); if (onoff) { @@ -898,7 +898,7 @@ EditorRegions::populate_row_length (boost::shared_ptr<Region> region, TreeModel: { char buf[16]; - if (ARDOUR_UI::instance()->secondary_clock->mode () == AudioClock::BBT) { + if (ARDOUR_UI::instance()->primary_clock->mode () == AudioClock::BBT) { TempoMap& map (_session->tempo_map()); Timecode::BBT_Time bbt = map.bbt_at_beat (map.beat_at_sample (region->last_sample()) - map.beat_at_sample (region->first_sample())); snprintf (buf, sizeof (buf), "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks); |