From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 13 Sep 2017 22:48:25 +0000 (-0400)
Subject: changes required to operate with the Evoral::Beats ticktime commit
X-Git-Tag: 6.0-pre0~8
X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=e37558502eabc54768b0858fb611aeba40d1fc9e

changes required to operate with the Evoral::Beats ticktime commit
---

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index f7bd882260..b0eba11cd9 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -4301,7 +4301,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid
 
 		/* Snap start time backwards, so copy/paste is snap aligned. */
 		if (midi) {
-			if (earliest == Evoral::Beats::max()) {
+			if (earliest == std::numeric_limits<Evoral::Beats>::max()) {
 				earliest = Evoral::Beats();  // Weird... don't offset
 			}
 			earliest.round_down_to_beat();
@@ -4369,7 +4369,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid
 void
 Editor::cut_copy_midi (CutCopyOp op)
 {
-	Evoral::Beats earliest = Evoral::Beats::max();
+	Evoral::Beats earliest = std::numeric_limits<Evoral::Beats>::max();
 	for (MidiRegionSelection::iterator i = selection->midi_regions.begin(); i != selection->midi_regions.end(); ++i) {
 		MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
 		if (mrv) {
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 9d5a6f86e6..a8124a9675 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -1424,11 +1424,13 @@ MidiRegionView::display_sysexes()
 		}
 
 		// Show unless message is beyond the region bounds
-		if (time - _region->start() >= _region->length() || time < _region->start()) {
-			sysex->hide();
-		} else {
-			sysex->show();
-		}
+// XXX REQUIRES APPROPRIATE OPERATORS FOR Evoral::Beats and framepos? say what?
+#warning paul fix this
+//		if (time - _region->start() >= _region->length() || time < _region->start()) {
+//			sysex->hide();
+//		} else {
+//			sysex->show();
+//		}
 	}
 }
 
@@ -2395,7 +2397,7 @@ MidiRegionView::note_selected (NoteBase* ev, bool add, bool extend)
 	} else {
 		/* find end of latest note selected, select all between that and the start of "ev" */
 
-		Evoral::Beats earliest = Evoral::MaxBeats;
+		Evoral::Beats earliest = std::numeric_limits<Evoral::Beats>::max();
 		Evoral::Beats latest   = Evoral::Beats();
 
 		for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
@@ -2551,7 +2553,7 @@ MidiRegionView::add_to_selection (NoteBase* ev)
 Evoral::Beats
 MidiRegionView::earliest_in_selection ()
 {
-	Evoral::Beats earliest = Evoral::MaxBeats;
+	Evoral::Beats earliest = std::numeric_limits<Evoral::Beats>::max();
 
 	for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
 		if ((*i)->note()->time() < earliest) {