X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_info_box.cc;h=d5d77acee8af1d729edc4fe49278d6d1790cd689;hb=9ccc56e162554c292b25408246e3680b8f14eea7;hp=2c316c05a9ffb4923114bc31639cc5f367708ddc;hpb=fb761a6fa7719fbd532dec08564142336316d92c;p=ardour.git

diff --git a/gtk2_ardour/time_info_box.cc b/gtk2_ardour/time_info_box.cc
index 2c316c05a9..d5d77acee8 100644
--- a/gtk2_ardour/time_info_box.cc
+++ b/gtk2_ardour/time_info_box.cc
@@ -233,10 +233,10 @@ TimeInfoBox::set_session (Session* s)
 void
 TimeInfoBox::region_selection_changed ()
 {
-	framepos_t s, e;
+	samplepos_t s, e;
 	Selection& selection (Editor::instance().get_selection());
 	s = selection.regions.start();
-	e = selection.regions.end_frame();
+	e = selection.regions.end_sample();
 	selection_start->set_off (false);
 	selection_end->set_off (false);
 	selection_length->set_off (false);
@@ -248,7 +248,7 @@ TimeInfoBox::region_selection_changed ()
 void
 TimeInfoBox::selection_changed ()
 {
-	framepos_t s, e;
+	samplepos_t s, e;
 	Selection& selection (Editor::instance().get_selection());
 
 	region_property_connections.drop_connections();
@@ -274,18 +274,18 @@ TimeInfoBox::selection_changed ()
 					selection_end->set_off (false);
 					selection_length->set_off (false);
 					selection_start->set (selection.time.start());
-					selection_end->set (selection.time.end_frame());
-					selection_length->set (selection.time.length());
+					selection_end->set (selection.time.end_sample());
+					selection_length->set (selection.time.end_sample(), false, selection.time.start());
 				} else {
 					selection_start->set_off (true);
 					selection_end->set_off (true);
 					selection_length->set_off (true);
 				}
 			} else {
-				s = max_framepos;
+				s = max_samplepos;
 				e = 0;
 				for (PointSelection::iterator i = selection.points.begin(); i != selection.points.end(); ++i) {
-					framepos_t const p = (*i)->line().session_position ((*i)->model ());
+					samplepos_t const p = (*i)->line().session_position ((*i)->model ());
 					s = min (s, p);
 					e = max (e, p);
 				}
@@ -294,7 +294,7 @@ TimeInfoBox::selection_changed ()
 				selection_length->set_off (false);
 				selection_start->set (s);
 				selection_end->set (e);
-				selection_length->set (e - s + 1);
+				selection_length->set (e, false, s);
 			}
 		} else {
 			/* this is more efficient than tracking changes per region in large selections */
@@ -321,13 +321,13 @@ TimeInfoBox::selection_changed ()
 			if (tact && tact->get_active() &&  !selection.regions.empty()) {
 				/* show selected regions */
 				s = selection.regions.start();
-				e = selection.regions.end_frame();
+				e = selection.regions.end_sample();
 				selection_start->set_off (false);
 				selection_end->set_off (false);
 				selection_length->set_off (false);
 				selection_start->set (s);
 				selection_end->set (e);
-				selection_length->set (e - s + 1);
+				selection_length->set (e, false, s);
 			} else {
 				selection_start->set_off (true);
 				selection_end->set_off (true);
@@ -338,8 +338,8 @@ TimeInfoBox::selection_changed ()
 			selection_end->set_off (false);
 			selection_length->set_off (false);
 			selection_start->set (selection.time.start());
-			selection_end->set (selection.time.end_frame());
-			selection_length->set (selection.time.length());
+			selection_end->set (selection.time.end_sample());
+			selection_length->set (selection.time.end_sample(), false, selection.time.start());
 		}
 		break;