L: force grid type to timecode

Mostly this is to make sure that we never include marks earlier than @param lower.
The sample->timecode conversion common to all rule scales is now moved outside
of the switch block, and an unnecessary floor() call was removed.

gtk2_ardour/editor.cc

@@ -365,7 +365,11 @@ Editor::Editor ()
 	, select_new_marker (false)
 	, have_pending_keyboard_selection (false)
 	, pending_keyboard_selection_start (0)
+#ifdef LIVETRAX
+	, _grid_type (GridTypeTimecode)
+#else
 	, _grid_type (GridTypeBeat)
+#endif
 	, _snap_mode (SnapOff)
 	, _draw_length (GridTypeNone)
 	, _draw_velocity (DRAW_VEL_AUTO)
@@ -2482,6 +2486,9 @@ Editor::set_draw_channel_to (int c)
 void
 Editor::set_grid_to (GridType gt)
 {
+#ifdef LIVETRAX
+	gt = GridTypeTimecode;
+#endif
 	unsigned int grid_ind = (unsigned int)gt;
 
 	if (internal_editing() && UIConfiguration::instance().get_grid_follows_internal()) {
@@ -2691,8 +2698,14 @@ Editor::set_state (const XMLNode& node, int version)
 		set_snap_mode (_snap_mode);
 	}
 
+#ifdef LIVETRAX
+	_grid_type = GridTypeTimecode;
+	internal_grid_type = GridTypeTimecode;
+	pre_internal_grid_type = GridTypeTimecode;
+#else
 	node.get_property ("internal-grid-type", internal_grid_type);
 	node.get_property ("internal-snap-mode", internal_snap_mode);
+#endif
 	node.get_property ("pre-internal-grid-type", pre_internal_grid_type);
 	node.get_property ("pre-internal-snap-mode", pre_internal_snap_mode);
 

gtk2_ardour/editor_rulers.cc

@@ -922,10 +922,12 @@ Editor::set_timecode_ruler_scale (samplepos_t lower, samplepos_t upper)
 		timecode_ruler_scale = timecode_show_many_hours;
 		timecode_mark_modulo = std::max ((samplecnt_t) 1, 1 + (hours_in_range / timecode_nmarks));
 	}
+
+	timecode_mark_modulo = 1;
 }
 
 void
-Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int64_t lower, int64_t /*upper*/, gint /*maxchars*/)
+Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int64_t lower, int64_t upper, gint /*maxchars*/)
 {
 	samplepos_t pos;
 	samplecnt_t spacer;
@@ -944,14 +946,16 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int6
 		lower = 0;
 	}
 
-	pos = (samplecnt_t) floor (lower);
+	pos = lower;
+	// Find timecode time of this sample (pos)
+	_session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */);
 
 	switch (timecode_ruler_scale) {
 	case timecode_show_bits:
 		// Find timecode time of this sample (pos) with subframe accuracy
-		_session->sample_to_timecode(pos, timecode, true /* use_offset */, true /* use_subframes */);
 		for (n = 0; n < timecode_nmarks; n++) {
 			_session->timecode_to_sample(timecode, pos, true /* use_offset */, true /* use_subframes */);
+			if (pos >= lower) {
 				if ((timecode.subframes % timecode_mark_modulo) == 0) {
 					if (timecode.subframes == 0) {
 						mark.style = ArdourCanvas::Ruler::Mark::Major;
@@ -967,18 +971,18 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int6
 				mark.label = buf;
 				mark.position = pos;
 				marks.push_back (mark);
+			}
 			// Increment subframes by one
 			Timecode::increment_subframes (timecode, _session->config.get_subframes_per_frame());
 		}
 		break;
 
 	case timecode_show_samples:
-		// Find timecode time of this sample (pos)
-		_session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */);
 		// Go to next whole sample down
 		Timecode::frames_floot (timecode);
 		for (n = 0; n < timecode_nmarks; n++) {
 			_session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */);
+			if (pos >= lower) {
 				if ((timecode.frames % timecode_mark_modulo) == 0) {
 					if (timecode.frames == 0) {
 						mark.style = ArdourCanvas::Ruler::Mark::Major;
@@ -994,17 +998,17 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int6
 				}
 				mark.label = buf;
 				marks.push_back (mark);
+			}
 			Timecode::increment (timecode, _session->config.get_subframes_per_frame());
 		}
 		break;
 
 	case timecode_show_seconds:
-		// Find timecode time of this sample (pos)
-		_session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */);
 		// Go to next whole second down
 		Timecode::seconds_floor (timecode);
 		for (n = 0; n < timecode_nmarks; n++) {
 			_session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */);
+			if (pos >= lower) {
 				if ((timecode.seconds % timecode_mark_modulo) == 0) {
 					if (timecode.seconds == 0) {
 						mark.style = ArdourCanvas::Ruler::Mark::Major;
@@ -1021,17 +1025,17 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int6
 				}
 				mark.label = buf;
 				marks.push_back (mark);
+			}
 			Timecode::increment_seconds (timecode, _session->config.get_subframes_per_frame());
 		}
 		break;
 
 	case timecode_show_minutes:
-		//Find timecode time of this sample (pos)
-		_session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */);
 		// Go to next whole minute down
 		Timecode::minutes_floor (timecode);
 		for (n = 0; n < timecode_nmarks; n++) {
 			_session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */);
+			if (pos >= lower) {
 				if ((timecode.minutes % timecode_mark_modulo) == 0) {
 					if (timecode.minutes == 0) {
 						mark.style = ArdourCanvas::Ruler::Mark::Major;
@@ -1046,16 +1050,16 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int6
 				mark.label = buf;
 				mark.position = pos;
 				marks.push_back (mark);
+			}
 			Timecode::increment_minutes (timecode, _session->config.get_subframes_per_frame());
 		}
 		break;
 	case timecode_show_hours:
-		// Find timecode time of this sample (pos)
-		_session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */);
 		// Go to next whole hour down
 		Timecode::hours_floor (timecode);
 		for (n = 0; n < timecode_nmarks; n++) {
 			_session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */);
+			if (pos >= lower) {
 				if ((timecode.hours % timecode_mark_modulo) == 0) {
 					mark.style = ArdourCanvas::Ruler::Mark::Major;
 					snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
@@ -1066,17 +1070,17 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int6
 				mark.label = buf;
 				mark.position = pos;
 				marks.push_back (mark);
+			}
 			Timecode::increment_hours (timecode, _session->config.get_subframes_per_frame());
 		}
 		break;
 	case timecode_show_many_hours:
-		// Find timecode time of this sample (pos)
-		_session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */);
 		// Go to next whole hour down
 		Timecode::hours_floor (timecode);
 
 		for (n = 0; n < timecode_nmarks;) {
 			_session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */);
+			if (pos >= lower) {
 				if ((timecode.hours % timecode_mark_modulo) == 0) {
 					mark.style = ArdourCanvas::Ruler::Mark::Major;
 					snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
@@ -1085,6 +1089,7 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int6
 					marks.push_back (mark);
 					++n;
 				}
+			}
 			/* can't use Timecode::increment_hours() here because we may be traversing thousands of hours
 			 * and doing it 1 hour at a time is just stupid (and slow).
 			 */