Undo more incorrect sample/frame replacements

5 files changed, 12 insertions, 14 deletions

diff --git a/libs/ardour/ardour/uri_map.h b/libs/ardour/ardour/uri_map.h
index 9c1aee30e9..de0999d94f 100644
--- a/libs/ardour/ardour/uri_map.h
+++ b/libs/ardour/ardour/uri_map.h
@@ -78,7 +78,7 @@ public:
 		uint32_t time_beatUnit;
 		uint32_t time_beatsPerBar;
 		uint32_t time_beatsPerMinute;
-		uint32_t time_sample;
+		uint32_t time_frame;
 		uint32_t time_speed;
 		uint32_t patch_Get;
 		uint32_t patch_Set;
diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index 2b45e9e28a..974ed87c2d 100644
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -2553,7 +2553,7 @@ write_position(LV2_Atom_Forge*     forge,
 	LV2_Atom_Forge_Frame sample;
 #ifdef HAVE_LV2_1_10_0
 	lv2_atom_forge_object(forge, &sample, 0, urids.time_Position);
-	lv2_atom_forge_key(forge, urids.time_sample);
+	lv2_atom_forge_key(forge, urids.time_frame);
 	lv2_atom_forge_long(forge, position);
 	lv2_atom_forge_key(forge, urids.time_speed);
 	lv2_atom_forge_float(forge, speed);
@@ -2570,7 +2570,7 @@ write_position(LV2_Atom_Forge*     forge,
 	lv2_atom_forge_float(forge, bpm);
 #else
 	lv2_atom_forge_blank(forge, &sample, 1, urids.time_Position);
-	lv2_atom_forge_property_head(forge, urids.time_sample, 0);
+	lv2_atom_forge_property_head(forge, urids.time_frame, 0);
 	lv2_atom_forge_long(forge, position);
 	lv2_atom_forge_property_head(forge, urids.time_speed, 0);
 	lv2_atom_forge_float(forge, speed);
diff --git a/libs/ardour/mididm.cc b/libs/ardour/mididm.cc
index 14684792fd..b70fb7e10a 100644
--- a/libs/ardour/mididm.cc
+++ b/libs/ardour/mididm.cc
@@ -78,7 +78,7 @@ int MIDIDM::process (pframes_t nframes, PortEngine &pe, void *midi_in, void *mid
 	obuf[1] = (_monotonic_cnt)      & 0x7f;
 	obuf[2] = (_monotonic_cnt >> 7) & 0x7f;
 	pe.midi_event_put (midi_out, 0, obuf, 3);
-#else // sysex MTC sample
+#else // sysex MTC frame
 	uint8_t obuf[10];
 	obuf[0] = 0xf0;
 	obuf[1] = 0x7f;
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index cc12b959d5..93981a9d68 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -77,7 +77,7 @@ Session::setup_midi_control ()
 	outbound_mtc_timecode_frame = 0;
 	next_quarter_frame_to_send = 0;
 
-	/* Set up the qtr sample message */
+	/* Set up the qtr frame message */
 
 	mtc_msg[0] = 0xf1;
 	mtc_msg[2] = 0xf1;
@@ -300,7 +300,7 @@ Session::mmc_locate (MIDI::MachineControl &/*mmc*/, const MIDI::byte* mmc_tc)
 		target_sample = max_samplepos;
 	}
 
-	/* Some (all?) MTC/MMC devices do not send a full MTC sample
+	/* Some (all?) MTC/MMC devices do not send a full MTC frame
 	   at the end of a locate, instead sending only an MMC
 	   locate command. This causes the current position
 	   of an MTC slave to become out of date. Catch this.
@@ -438,11 +438,9 @@ Session::send_full_time_code (samplepos_t const t, MIDI::pframes_t nframes)
 
 	DEBUG_TRACE (DEBUG::MTC, string_compose ("Full MTC TC %1 (off %2)\n", outbound_mtc_timecode_frame, mtc_offset));
 
-	// I don't understand this bit yet.. [DR]
-	// I do [rg]:
-	// according to MTC spec 24, 30 drop and 30 non-drop TC, the sample-number represented by 8 quarter frames must be even.
+	/* according to MTC spec 24, 30 drop and 30 non-drop TC, the frame-number represented by 8 quarter frames must be even. */
 	if (((mtc_timecode_bits >> 5) != MIDI::MTC_25_FPS) && (transmitting_timecode_time.frames % 2)) {
-		// start MTC quarter frame transmission on an even sample
+		/* start MTC quarter frame transmission on an even frame */
 		Timecode::increment (transmitting_timecode_time, config.get_subframes_per_frame());
 		outbound_mtc_timecode_frame += _samples_per_timecode_frame;
 	}
@@ -474,7 +472,7 @@ Session::send_full_time_code (samplepos_t const t, MIDI::pframes_t nframes)
 /** Send MTC (quarter-frame) messages for this cycle.
  * Must be called exactly once per cycle from the process thread.  Realtime safe.
  * This function assumes the state of full Timecode is sane, eg. the slave is
- * expecting quarter frame messages and has the right sample of reference (any
+ * expecting quarter frame messages and has the right frame of reference (any
  * full MTC Timecode time messages that needed to be sent should have been sent
  * earlier already this cycle by send_full_time_code)
  */
@@ -575,8 +573,8 @@ Session::send_midi_time_code_for_cycle (samplepos_t start_sample, samplepos_t en
 
 #ifndef NDEBUG
 		if (DEBUG_ENABLED(DEBUG::MTC)) {
-			DEBUG_STR_DECL(foo)
-				DEBUG_STR_APPEND(foo,"sending ");
+			DEBUG_STR_DECL(foo);
+			DEBUG_STR_APPEND(foo,"sending ");
 			DEBUG_STR_APPEND(foo, transmitting_timecode_time);
 			DEBUG_TRACE (DEBUG::MTC, string_compose ("%1 qfm = %2, stamp = %3\n", DEBUG_STR(foo).str(), next_quarter_frame_to_send,
 			                                         out_stamp));
diff --git a/libs/ardour/uri_map.cc b/libs/ardour/uri_map.cc
index cdbdbd564c..2732d6bb06 100644
--- a/libs/ardour/uri_map.cc
+++ b/libs/ardour/uri_map.cc
@@ -56,7 +56,7 @@ URIMap::URIDs::init(URIMap& uri_map)
 	time_beatUnit       = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#beatUnit");
 	time_beatsPerBar    = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#beatsPerBar");
 	time_beatsPerMinute = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#beatsPerMinute");
-	time_sample          = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#frame");
+	time_frame           = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#frame");
 	time_speed          = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#speed");
 	patch_Get           = uri_map.uri_to_id("http://lv2plug.in/ns/ext/patch#Get");
 	patch_Set           = uri_map.uri_to_id("http://lv2plug.in/ns/ext/patch#Set");