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 | |
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')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/audio_clock.cc | 10 | ||||
-rw-r--r-- | gtk2_ardour/automation_line.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/editor.cc | 14 | ||||
-rw-r--r-- | gtk2_ardour/editor_canvas.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/editor_drag.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/editor_markers.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 73 | ||||
-rw-r--r-- | gtk2_ardour/editor_rulers.cc | 10 | ||||
-rw-r--r-- | gtk2_ardour/editor_selection.cc | 10 | ||||
-rw-r--r-- | gtk2_ardour/marker_selection.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/marker_time_axis_view.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/midi_region_view.cc | 7 | ||||
-rw-r--r-- | gtk2_ardour/midi_streamview.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/region_selection.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/route_params_ui.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/selection.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/strip_silence_dialog.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/time_selection.cc | 10 | ||||
-rw-r--r-- | gtk2_ardour/time_selection.h | 6 |
22 files changed, 95 insertions, 96 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 09964ecb5a..608e50466e 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1007,11 +1007,11 @@ ARDOUR_UI::update_disk_space() return; } - nframes_t frames = _session->available_capture_duration(); + framecnt_t frames = _session->available_capture_duration(); char buf[64]; nframes_t fr = _session->frame_rate(); - if (frames == max_frames) { + if (frames == max_framecnt) { strcpy (buf, _("Disk: 24hrs+")); } else { rec_enabled_streams = 0; diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index be1bb97713..7e3cf19ca5 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -1493,7 +1493,7 @@ AudioClock::timecode_frame_from_display () const } Timecode::Time timecode; - nframes_t sample; + framepos_t sample; timecode.hours = atoi (hours_label.get_text()); timecode.minutes = atoi (minutes_label.get_text()); @@ -1516,12 +1516,12 @@ AudioClock::timecode_frame_from_display () const // Testcode for timecode<->sample conversions (P.S.) Timecode::Time timecode1; - nframes_t sample1; - nframes_t oldsample = 0; + framepos_t sample1; + framepos_t oldsample = 0; Timecode::Time timecode2; - nframes_t sample_increment; + framecnt_t sample_increment; - sample_increment = (long)rint(_session->frame_rate() / _session->timecode_frames_per_second); + sample_increment = (framecnt_t)rint(_session->frame_rate() / _session->timecode_frames_per_second); #ifdef Timecode_SAMPLE_TEST_1 // Test 1: use_offset = false, use_subframes = false 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 ()); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index b3d9fabdb2..c134c4190c 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -904,8 +904,8 @@ Editor::control_scroll (float fraction) if ((fraction < 0.0f) && (*_control_scroll_target < (nframes64_t) fabs(step))) { *_control_scroll_target = 0; - } else if ((fraction > 0.0f) && (max_frames - *_control_scroll_target < step)) { - *_control_scroll_target = max_frames - (current_page_frames()*2); // allow room for slop in where the PH is on the screen + } else if ((fraction > 0.0f) && (max_framepos - *_control_scroll_target < step)) { + *_control_scroll_target = max_framepos - (current_page_frames()*2); // allow room for slop in where the PH is on the screen } else { *_control_scroll_target += (nframes64_t) floor (step); } @@ -2865,11 +2865,11 @@ Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark) _session->locations()->marks_either_side (start, before, after); - if (before == max_frames) { + if (before == max_framepos) { start = after; - } else if (after == max_frames) { + } else if (after == max_framepos) { start = before; - } else if (before != max_frames && after != max_frames) { + } else if (before != max_framepos && after != max_framepos) { /* have before and after */ if ((start - before) < (after - start)) { start = before; @@ -4506,7 +4506,7 @@ Editor::set_frames_per_unit (double fpu) of frames into an 800 pixel wide space. */ - if (max_frames / fpu < 800.0) { + if (max_framepos / fpu < 800.0) { return; } @@ -4804,7 +4804,7 @@ Editor::get_regions_after (RegionSelection& rs, nframes64_t where, const TrackVi if ((tr = rtv->track()) && ((pl = tr->playlist()))) { Playlist::RegionList* regions = pl->regions_touched ( - (nframes64_t) floor ( (double)where * tr->speed()), max_frames); + (framepos_t) floor ( (double)where * tr->speed()), max_framepos); for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) { diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 52850644be..004c4a3fd2 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -554,7 +554,7 @@ Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert) } if (_drags->current_pointer_frame() > rightmost_frame && allow_horiz) { - if (rightmost_frame < max_frames) { + if (rightmost_frame < max_framepos) { autoscroll_x = 1; startit = true; } @@ -586,8 +586,8 @@ Editor::_autoscroll_canvas (void *arg) bool Editor::autoscroll_canvas () { - nframes64_t new_frame; - nframes64_t limit = max_frames - current_page_frames(); + framepos_t new_frame; + framepos_t limit = max_framepos - current_page_frames(); GdkEventMotion ev; double new_pixel; double target_pixel; diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 9b688adc45..eb37d11282 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -127,10 +127,10 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) case GDK_SCROLL_RIGHT: xdelta = (current_page_frames() / 8); - if (max_frames - xdelta > leftmost_frame) { + if (max_framepos - xdelta > leftmost_frame) { reset_x_origin (leftmost_frame + xdelta); } else { - reset_x_origin (max_frames - current_page_frames()); + reset_x_origin (max_framepos - current_page_frames()); } break; diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 14b0bd83d3..87d7b6a1a9 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -452,7 +452,7 @@ RegionMotionDrag::compute_x_delta (GdkEvent const * event, framepos_t* pending_r *pending_region_position = _last_frame_position; } - if (*pending_region_position > max_frames - _primary->region()->length()) { + if (*pending_region_position > max_framepos - _primary->region()->length()) { *pending_region_position = _last_frame_position; } @@ -2307,7 +2307,7 @@ MarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) e = max (_marker->position(), e); s = min (s, e); e = max (s, e); - if (e < max_frames) { + if (e < max_framepos) { ++e; } _editor->session()->locations()->find_all_between (s, e, ll, Location::Flags (0)); @@ -3508,11 +3508,11 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred) _editor->session()->locations()->marks_either_side (grab_frame(), start, end); - if (end == max_frames) { + if (end == max_framepos) { end = _editor->session()->current_end_frame (); } - if (start == max_frames) { + if (start == max_framepos) { start = _editor->session()->current_start_frame (); } diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index ae97d5c38f..8e486aa6cc 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -870,7 +870,7 @@ Editor::marker_menu_range_to_next () nframes64_t end; _session->locations()->marks_either_side (marker->position(), start, end); - if (end != max_frames) { + if (end != max_framepos) { string range_name = l->name(); range_name += "-range"; diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 159df414a9..5d678da798 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -351,20 +351,20 @@ Editor::nudge_forward (bool next, bool force_playhead) if (next) { distance = next_distance; } - if (max_frames - distance > loc->start() + loc->length()) { + if (max_framepos - distance > loc->start() + loc->length()) { loc->set_start (loc->start() + distance); } else { - loc->set_start (max_frames - loc->length()); + loc->set_start (max_framepos - loc->length()); } } else { distance = get_nudge_distance (loc->end(), next_distance); if (next) { distance = next_distance; } - if (max_frames - distance > loc->end()) { + if (max_framepos - distance > loc->end()) { loc->set_end (loc->end() + distance); } else { - loc->set_end (max_frames); + loc->set_end (max_framepos); } } XMLNode& after (loc->get_state()); @@ -597,7 +597,7 @@ Editor::build_region_boundary_cache () while (pos < _session->current_end_frame() && !at_end) { framepos_t rpos; - framepos_t lpos = max_frames; + framepos_t lpos = max_framepos; for (vector<RegionPoint>::iterator p = interesting_points.begin(); p != interesting_points.end(); ++p) { @@ -670,7 +670,7 @@ boost::shared_ptr<Region> Editor::find_next_region (framepos_t frame, RegionPoint point, int32_t dir, TrackViewList& tracks, TimeAxisView **ontrack) { TrackViewList::iterator i; - nframes64_t closest = max_frames; + framepos_t closest = max_framepos; boost::shared_ptr<Region> ret; framepos_t rpos = 0; @@ -732,7 +732,7 @@ Editor::find_next_region (framepos_t frame, RegionPoint point, int32_t dir, Trac framepos_t Editor::find_next_region_boundary (framepos_t pos, int32_t dir, const TrackViewList& tracks) { - framecnt_t distance = max_frames; + framecnt_t distance = max_framepos; framepos_t current_nearest = -1; for (TrackViewList::const_iterator i = tracks.begin(); i != tracks.end(); ++i) { @@ -1183,18 +1183,18 @@ Editor::selected_marker_to_selection_end () void Editor::scroll_playhead (bool forward) { - nframes64_t pos = playhead_cursor->current_frame; - nframes64_t delta = (nframes64_t) floor (current_page_frames() / 0.8); + framepos_t pos = playhead_cursor->current_frame; + framecnt_t delta = (framecnt_t) floor (current_page_frames() / 0.8); if (forward) { - if (pos == max_frames) { + if (pos == max_framepos) { return; } - if (pos < max_frames - delta) { + if (pos < max_framepos - delta) { pos += delta ; } else { - pos = max_frames; + pos = max_framepos; } } else { @@ -1428,8 +1428,8 @@ Editor::scroll_forward (float pages) } } - if (max_frames - cnt < leftmost_frame) { - frame = max_frames - cnt; + if (max_framepos - cnt < leftmost_frame) { + frame = max_framepos - cnt; } else { frame = leftmost_frame + cnt; } @@ -1584,8 +1584,8 @@ Editor::temporal_zoom (gdouble fpu) if (l < 0) { leftmost_after_zoom = 0; - } else if (l > max_frames) { - leftmost_after_zoom = max_frames - new_page_size; + } else if (l > max_framepos) { + leftmost_after_zoom = max_framepos - new_page_size; } else { leftmost_after_zoom = (nframes64_t) l; } @@ -1610,8 +1610,8 @@ Editor::temporal_zoom (gdouble fpu) if (l < 0) { leftmost_after_zoom = 0; - } else if (l > max_frames) { - leftmost_after_zoom = max_frames - new_page_size; + } else if (l > max_framepos) { + leftmost_after_zoom = max_framepos - new_page_size; } else { leftmost_after_zoom = (nframes64_t) l; } @@ -1629,8 +1629,8 @@ Editor::temporal_zoom (gdouble fpu) if (l < 0) { leftmost_after_zoom = 0; - } else if (l > max_frames) { - leftmost_after_zoom = max_frames - new_page_size; + } else if (l > max_framepos) { + leftmost_after_zoom = max_framepos - new_page_size; } else { leftmost_after_zoom = (nframes64_t) l; } @@ -1651,9 +1651,8 @@ Editor::temporal_zoom (gdouble fpu) void Editor::temporal_zoom_region (bool both_axes) { - - nframes64_t start = max_frames; - nframes64_t end = 0; + framepos_t start = max_framepos; + framepos_t end = 0; RegionSelection rs; set<TimeAxisView*> tracks; @@ -1701,10 +1700,10 @@ Editor::temporal_zoom_region (bool both_axes) start = 0; } - if (max_frames - extra_samples > end) { + if (max_framepos - extra_samples > end) { end += extra_samples; } else { - end = max_frames; + end = max_framepos; } if (both_axes) { @@ -2566,8 +2565,8 @@ Editor::play_edit_range () void Editor::play_selected_region () { - nframes64_t start = max_frames; - nframes64_t end = 0; + framepos_t start = max_framepos; + framepos_t end = 0; RegionSelection rs; get_regions_for_action (rs); @@ -3058,10 +3057,10 @@ Editor::crop_region_to (nframes64_t start, nframes64_t end) */ the_start = max (the_start, (nframes64_t) region->position()); - if (max_frames - the_start < region->length()) { + if (max_framepos - the_start < region->length()) { the_end = the_start + region->length() - 1; } else { - the_end = max_frames; + the_end = max_framepos; } the_end = min (end, the_end); cnt = the_end - the_start + 1; @@ -4091,7 +4090,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) vector<PlaylistMapping> pmap; - nframes64_t first_position = max_frames; + framepos_t first_position = max_framepos; typedef set<boost::shared_ptr<Playlist> > FreezeList; FreezeList freezelist; @@ -4284,7 +4283,7 @@ Editor::paste_internal (nframes64_t position, float times) } } - if (position == max_frames) { + if (position == max_framepos) { position = get_preferred_edit_position(); } @@ -5712,8 +5711,8 @@ Editor::set_loop_from_edit_range (bool play) void Editor::set_loop_from_region (bool play) { - nframes64_t start = max_frames; - nframes64_t end = 0; + framepos_t start = max_framepos; + framepos_t end = 0; RegionSelection rs; @@ -5773,8 +5772,8 @@ Editor::set_punch_from_edit_range () void Editor::set_punch_from_region () { - nframes64_t start = max_frames; - nframes64_t end = 0; + framepos_t start = max_framepos; + framepos_t end = 0; RegionSelection rs; @@ -6341,8 +6340,8 @@ void Editor::playhead_forward_to_grid () { if (!_session) return; - nframes64_t pos = playhead_cursor->current_frame; - if (pos < max_frames - 1) { + framepos_t pos = playhead_cursor->current_frame; + if (pos < max_framepos - 1) { pos += 2; snap_to_internal (pos, 1, false); _session->request_locate (pos); diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 758be0f6c9..6c789f25d9 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -195,10 +195,10 @@ Editor::ruler_scroll (GdkEventScroll* event) case GDK_SCROLL_RIGHT: xdelta = (current_page_frames() / 2); - if (max_frames - xdelta > leftmost_frame) { + if (max_framepos - xdelta > leftmost_frame) { reset_x_origin (leftmost_frame + xdelta); } else { - reset_x_origin (max_frames - current_page_frames()); + reset_x_origin (max_framepos - current_page_frames()); } handled = true; break; @@ -977,8 +977,8 @@ Editor::set_timecode_ruler_scale (gdouble lower, gdouble upper) gint Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/) { - nframes_t pos; - nframes64_t spacer; + framepos_t pos; + framecnt_t spacer; Timecode::Time timecode; gchar buf[16]; gint n; @@ -987,7 +987,7 @@ Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble return 0; } - if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) { + if (lower > (spacer = (framecnt_t)(128 * Editor::get_current_zoom ()))) { lower = lower - spacer; } else { lower = 0; diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index 806efaa66a..19166750cc 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -586,14 +586,14 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, } else if (op == Selection::Extend) { list<Selectable*> results; - nframes64_t last_frame; - nframes64_t first_frame; + framepos_t last_frame; + framepos_t first_frame; bool same_track = false; /* 1. find the last selected regionview in the track that was clicked in */ last_frame = 0; - first_frame = max_frames; + first_frame = max_framepos; for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) { if (&(*x)->get_time_axis_view() == &clicked_regionview->get_time_axis_view()) { @@ -988,7 +988,7 @@ Editor::select_all_in_track (Selection::Operation op) return; } - clicked_routeview->get_selectables (0, max_frames, 0, DBL_MAX, touched); + clicked_routeview->get_selectables (0, max_framepos, 0, DBL_MAX, touched); switch (op) { case Selection::Toggle: @@ -1015,7 +1015,7 @@ Editor::select_all (Selection::Operation op) if ((*iter)->hidden()) { continue; } - (*iter)->get_selectables (0, max_frames, 0, DBL_MAX, touched); + (*iter)->get_selectables (0, max_framepos, 0, DBL_MAX, touched); } begin_reversible_command (_("select all")); switch (op) { diff --git a/gtk2_ardour/marker_selection.h b/gtk2_ardour/marker_selection.h index d2aacceacf..eea0a3a77d 100644 --- a/gtk2_ardour/marker_selection.h +++ b/gtk2_ardour/marker_selection.h @@ -26,7 +26,7 @@ struct MarkerSelection : public std::list<Marker*> { - void range (nframes64_t& start, nframes64_t& end); + void range (ARDOUR::framepos_t& start, ARDOUR::framepos_t& end); }; #endif /* __ardour_gtk_marker_selection_h__ */ diff --git a/gtk2_ardour/marker_time_axis_view.cc b/gtk2_ardour/marker_time_axis_view.cc index c4fa4bc4c8..c901f9ba52 100644 --- a/gtk2_ardour/marker_time_axis_view.cc +++ b/gtk2_ardour/marker_time_axis_view.cc @@ -57,7 +57,7 @@ MarkerTimeAxisView::MarkerTimeAxisView(MarkerTimeAxis& tv) canvas_rect = new ArdourCanvas::SimpleRect (*canvas_group); canvas_rect->property_x1() = 0.0; canvas_rect->property_y1() = 0.0; - canvas_rect->property_x2() = max_frames; + canvas_rect->property_x2() = max_framepos; canvas_rect->property_y2() = (double)20; canvas_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerTrack.get(); canvas_rect->property_fill_color_rgba() = stream_base_color; diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 505380cc25..9f2d859597 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -2610,11 +2610,12 @@ MidiRegionView::nudge_notes (bool forward) /* use grid */ - nframes64_t next_pos = ref_point; + framepos_t next_pos = ref_point; if (forward) { - /* XXX need check on max_frames, but that needs max_frames64 or something */ - next_pos += 1; + if (max_framepos - 1 < next_pos) { + next_pos += 1; + } } else { if (next_pos == 0) { return; diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 3bd46959de..fad87ee642 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -75,7 +75,7 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv) _note_lines->property_x1() = 0; _note_lines->property_y1() = 0; - _note_lines->property_x2() = trackview().editor().frame_to_pixel (max_frames); + _note_lines->property_x2() = trackview().editor().frame_to_pixel (max_framepos); _note_lines->property_y2() = 0; _note_lines->signal_event().connect(sigc::bind( diff --git a/gtk2_ardour/region_selection.cc b/gtk2_ardour/region_selection.cc index c10888a086..16f89e5eab 100644 --- a/gtk2_ardour/region_selection.cc +++ b/gtk2_ardour/region_selection.cc @@ -174,7 +174,7 @@ RegionSelection::remove (RegionView* rv) /* reset current start */ - nframes_t ref = max_frames; + framepos_t ref = max_framepos; for (RegionSelection::iterator i = begin (); i != end(); ++i) { if (region->first_frame() < ref) { diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index c9304d19cc..d947fbeb15 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -18,7 +18,6 @@ */ #include <algorithm> -#define __STDC_FORMAT_MACROS #include <inttypes.h> #include <glibmm/thread.h> diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index 886dffb651..63ece47e6a 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -1004,9 +1004,9 @@ Selection::add (const list<Marker*>& m) } void -MarkerSelection::range (nframes64_t& s, nframes64_t& e) +MarkerSelection::range (framepos_t& s, framepos_t& e) { - s = max_frames; + s = max_framepos; e = 0; for (MarkerSelection::iterator i = begin(); i != end(); ++i) { diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc index 55429dc3da..936c071290 100644 --- a/gtk2_ardour/strip_silence_dialog.cc +++ b/gtk2_ardour/strip_silence_dialog.cc @@ -488,9 +488,9 @@ StripSilenceDialog::update_stats (const SilenceResult& res) } max_silence = 0; - min_silence = max_frames; + min_silence = max_framepos; max_audible = 0; - min_audible = max_frames; + min_audible = max_framepos; SilenceResult::const_iterator cur; diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 9e52275733..118f4033a6 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -146,7 +146,7 @@ TimeAxisViewItem::init ( name_connected = false; fill_opacity = 60; position_locked = false; - max_item_duration = ARDOUR::max_frames; + max_item_duration = ARDOUR::max_framepos; min_item_duration = 0; show_vestigial = true; visibility = vis; diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc index 185c7e1eea..064e654cff 100644 --- a/gtk2_ardour/time_selection.cc +++ b/gtk2_ardour/time_selection.cc @@ -68,14 +68,14 @@ TimeSelection::consolidate () return changed; } -nframes_t +framepos_t TimeSelection::start () { if (empty()) { return 0; } - nframes_t first = max_frames; + framepos_t first = max_framepos; for (std::list<AudioRange>::iterator i = begin(); i != end(); ++i) { if ((*i).start < first) { @@ -85,10 +85,10 @@ TimeSelection::start () return first; } -nframes_t +framepos_t TimeSelection::end_frame () { - nframes_t last = 0; + framepos_t last = 0; /* XXX make this work like RegionSelection: no linear search needed */ @@ -100,7 +100,7 @@ TimeSelection::end_frame () return last; } -nframes_t +framecnt_t TimeSelection::length() { return end_frame() - start() + 1; diff --git a/gtk2_ardour/time_selection.h b/gtk2_ardour/time_selection.h index f93f40c21e..61e635e8be 100644 --- a/gtk2_ardour/time_selection.h +++ b/gtk2_ardour/time_selection.h @@ -32,9 +32,9 @@ class TimeSelection : public std::list<ARDOUR::AudioRange> public: ARDOUR::AudioRange& operator[](uint32_t); - nframes_t start(); - nframes_t end_frame(); - nframes_t length(); + ARDOUR::framepos_t start(); + ARDOUR::framepos_t end_frame(); + ARDOUR::framepos_t length(); bool consolidate (); }; |