globally change all use of "frame" to refer to audio into "sample".

Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode
and video in order to keep the legible

6 files changed, 14 insertions, 14 deletions

diff --git a/libs/midi++2/midi++/channel.h b/libs/midi++2/midi++/channel.h
index 6bd08073b3..ba95958d26 100644
--- a/libs/midi++2/midi++/channel.h
+++ b/libs/midi++2/midi++/channel.h
@@ -165,7 +165,7 @@ class LIBMIDIPP_API Channel : public PBD::ScopedConnectionList {
 	RPNList rpns;
 	RPNList nrpns;
 
-	void reset (timestamp_t timestamp, framecnt_t nframes, bool notes_off = true);
+	void reset (timestamp_t timestamp, samplecnt_t nframes, bool notes_off = true);
 
 	void process_note_off (Parser &, EventTwoBytes *);
 	void process_note_on (Parser &, EventTwoBytes *);
diff --git a/libs/midi++2/midi++/ipmidi_port.h b/libs/midi++2/midi++/ipmidi_port.h
index 8cefe09a40..d5a740f5a4 100644
--- a/libs/midi++2/midi++/ipmidi_port.h
+++ b/libs/midi++2/midi++/ipmidi_port.h
@@ -66,7 +66,7 @@ class LIBMIDIPP_API IPMIDIPort : public Port {
 
     int write (const byte *msg, size_t msglen, timestamp_t timestamp);
     int read (byte *buf, size_t bufsize);
-    void parse (framecnt_t timestamp);
+    void parse (samplecnt_t timestamp);
     int selectable () const;
 
     static const int lowest_ipmidi_port_default = 21928;
diff --git a/libs/midi++2/midi++/mmc.h b/libs/midi++2/midi++/mmc.h
index caf1605c29..bd8c19b6f9 100644
--- a/libs/midi++2/midi++/mmc.h
+++ b/libs/midi++2/midi++/mmc.h
@@ -178,7 +178,7 @@ class LIBMIDIPP_API MachineControl
 
 	/* The second argument points to a byte array containing
 	   the locate target value in MMC Standard Time Code
-	   format (5 bytes, roughly: hrs/mins/secs/frames/subframes)
+	   format (5 bytes, roughly: hrs/mins/secs/samples/subframes)
 	*/
 
 	PBD::Signal2<void,MachineControl &, const byte *> Locate;
diff --git a/libs/midi++2/midi++/parser.h b/libs/midi++2/midi++/parser.h
index 7040e9b522..3b1dd47052 100644
--- a/libs/midi++2/midi++/parser.h
+++ b/libs/midi++2/midi++/parser.h
@@ -35,7 +35,7 @@ class Parser;
 
 typedef PBD::Signal1<void,Parser&>                   ZeroByteSignal;
 typedef PBD::Signal2<void,Parser&,unsigned short>    BankSignal;
-typedef PBD::Signal2<void,Parser&,framecnt_t>        TimestampedSignal;
+typedef PBD::Signal2<void,Parser&,samplecnt_t>        TimestampedSignal;
 typedef PBD::Signal2<void,Parser&, byte>             OneByteSignal;
 typedef PBD::Signal2<void,Parser &, EventTwoBytes *> TwoByteSignal;
 typedef PBD::Signal2<void,Parser &, pitchbend_t>     PitchBendSignal;
@@ -53,8 +53,8 @@ class LIBMIDIPP_API Parser {
 	   therefore be set before every byte passed into ::scanner().
 	*/
 
-	framecnt_t get_timestamp() const { return _timestamp; }
-	void set_timestamp (const framecnt_t timestamp) { _timestamp = timestamp; }
+	samplecnt_t get_timestamp() const { return _timestamp; }
+	void set_timestamp (const samplecnt_t timestamp) { _timestamp = timestamp; }
 
 	/* signals that anyone can connect to */
 
@@ -131,8 +131,8 @@ class LIBMIDIPP_API Parser {
 	const byte *mtc_current() const { return _mtc_time; }
 	bool        mtc_locked() const  { return _mtc_locked; }
 
-	PBD::Signal3<void, Parser &, int, framecnt_t>      mtc_qtr;
-	PBD::Signal3<void, const byte *, bool, framecnt_t> mtc_time;
+	PBD::Signal3<void, Parser &, int, samplecnt_t>      mtc_qtr;
+	PBD::Signal3<void, const byte *, bool, samplecnt_t> mtc_time;
 	PBD::Signal1<void, MTC_Status>                     mtc_status;
 	PBD::Signal0<bool>                                 mtc_skipped;
 
@@ -172,13 +172,13 @@ class LIBMIDIPP_API Parser {
 	int   expected_mtc_quarter_frame_code;
 	byte _mtc_time[5];
 	byte _qtr_mtc_time[5];
-	unsigned long consecutive_qtr_frame_cnt;
+	unsigned long consecutive_qtr_sample_cnt;
 	MTC_FPS _mtc_fps;
 	MTC_Status _mtc_running;
 	bool       _mtc_locked;
-	byte last_qtr_frame;
+	byte last_qtr_sample;
 
-	framecnt_t _timestamp;
+	samplecnt_t _timestamp;
 
 	ParseState pre_variable_state;
 	MIDI::eventType pre_variable_msgtype;
diff --git a/libs/midi++2/midi++/port.h b/libs/midi++2/midi++/port.h
index 02cc340194..049d3a0a92 100644
--- a/libs/midi++2/midi++/port.h
+++ b/libs/midi++2/midi++/port.h
@@ -57,7 +57,7 @@ class LIBMIDIPP_API Port {
 	/** Write a message to port.
 	 * @param msg Raw MIDI message to send
 	 * @param msglen Size of @a msg
-	 * @param timestamp Time stamp in frames of this message (relative to cycle start)
+	 * @param timestamp Time stamp in samples of this message (relative to cycle start)
 	 * @return number of bytes successfully written
 	 */
 	virtual int write (const byte *msg, size_t msglen, timestamp_t timestamp) = 0;
@@ -85,7 +85,7 @@ class LIBMIDIPP_API Port {
 		return !(write (msg, len, timestamp) == (int) len);
 	}
 
-	virtual void parse (framecnt_t timestamp) = 0;
+	virtual void parse (samplecnt_t timestamp) = 0;
 
 	bool clock (timestamp_t timestamp);
 
diff --git a/libs/midi++2/midi++/types.h b/libs/midi++2/midi++/types.h
index c29ce1c767..8bcf36946f 100644
--- a/libs/midi++2/midi++/types.h
+++ b/libs/midi++2/midi++/types.h
@@ -33,7 +33,7 @@ namespace MIDI {
 	typedef uint32_t       timestamp_t;
 
 	/** XXX: dupes from libardour */
-	typedef int64_t  framecnt_t;
+	typedef int64_t  samplecnt_t;
 	typedef uint32_t pframes_t;
 
 	enum eventType {