diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 16:24:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 16:24:22 +0000 |
| commit | 10bdce85a0e7381d1b5db38e3640600c6fd3ec79 (patch) | |
| tree | 5e6fd6a2e69e972ada31018cbe6761e5ec5c77a7 /gtk2_ardour/automation_line.cc | |
| parent | e84c3fe5552bc5cf2ed23812c41e7e3b19fbdb84 (diff) | |
megaopus commit: (1) add __STD_(LIMIT|FORMAT)_MACROS to command line flags for cc and c++ builds, remove them from source (2) add new Property::midi_data used by MidiRegion to signal that its (MIDI) contents have changed (3) massive switch from nframes_t to framepos_t/framecnt_t including removal of ARDOUR::max_frames (replaced by ARDOUR::max_frame{pos,cnt} (lots more to do but this set was driven by changes to the Diskstream API to use framepos_t
git-svn-id: svn://localhost/ardour2/branches/3.0@7791 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_line.cc')
| -rw-r--r-- | gtk2_ardour/automation_line.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 880f0aa3e8..e674fd4fff 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -65,7 +65,7 @@ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanv , alist (al) , _parent_group (parent) , _time_converter (converter ? (*converter) : default_converter) - , _maximum_time (max_frames) + , _maximum_time (max_framepos) { points_visible = false; update_pending = false; @@ -565,13 +565,13 @@ AutomationLine::string_to_fraction (string const & s) const bool AutomationLine::invalid_point (ALPoints& p, uint32_t index) { - return p[index].x == max_frames && p[index].y == DBL_MAX; + return p[index].x == max_framepos && p[index].y == DBL_MAX; } void AutomationLine::invalidate_point (ALPoints& p, uint32_t index) { - p[index].x = max_frames; + p[index].x = max_framepos; p[index].y = DBL_MAX; } @@ -1343,7 +1343,7 @@ AutomationLine::set_maximum_time (framepos_t t) pair<framepos_t, framepos_t> AutomationLine::get_point_x_range () const { - pair<framepos_t, framepos_t> r (max_frames, 0); + pair<framepos_t, framepos_t> r (max_framepos, 0); for (AutomationList::const_iterator i = the_list()->begin(); i != the_list()->end(); ++i) { r.first = min (r.first, _time_converter.to ((*i)->when) + _time_converter.origin_b ()); |