diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-02 17:50:37 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-02 17:50:37 +0000 |
| commit | 83f385d26336f58c1b2e3ce49c609fe86878b56d (patch) | |
| tree | 5cc50c4afd705ad83ee4455bd4547eaffc7e7895 /gtk2_ardour/editor_regions.cc | |
| parent | add91aa2d723c15148d83dae7c8178ee6102146e (diff) | |
audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way
git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_regions.cc')
| -rw-r--r-- | gtk2_ardour/editor_regions.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index 7f3e8142dc..b2de5c6383 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -37,6 +37,7 @@ #include "gtkmm2ext/choice.h" #include "gtkmm2ext/treeutils.h" +#include "audio_clock.h" #include "editor.h" #include "editing.h" #include "keyboard.h" @@ -174,7 +175,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()->secondary_clock->mode_changed.connect (sigc::mem_fun(*this, &EditorRegions::update_all_rows)); ARDOUR::Region::RegionPropertyChanged.connect (region_property_connection, MISSING_INVALIDATOR, ui_bind (&EditorRegions::region_changed, this, _1, _2), gui_context()); ARDOUR::RegionFactory::CheckNewRegion.connect (check_new_region_connection, MISSING_INVALIDATOR, ui_bind (&EditorRegions::add_region, this, _1), gui_context()); @@ -660,7 +661,7 @@ EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize) Timecode::BBT_Time bbt; Timecode::Time timecode; - switch (ARDOUR_UI::instance()->secondary_clock.mode ()) { + switch (ARDOUR_UI::instance()->secondary_clock->mode ()) { case AudioClock::BBT: _session->tempo_map().bbt_time (pos, bbt); snprintf (buf, bufsize, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks); |