change libtimecode to libtemporal, add Evoral::Beats, positional types and superclock headers

libs/temporal/temporal/beats.h

@@ -0,0 +1,326 @@
+/* This file is part of Evoral.
+ * Copyright (C) 2008-2015 David Robillard <http://drobilla.net>
+ * Copyright (C) 2000-2008 Paul Davis
+ *
+ * Evoral is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * Evoral is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef EVORAL_BEATS_HPP
+#define EVORAL_BEATS_HPP
+
+#include <float.h>
+#include <math.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <iostream>
+#include <limits>
+
+#include "evoral/visibility.h"
+
+namespace Evoral {
+
+/** Musical time in beats. */
+class /*LIBEVORAL_API*/ Beats {
+public:
+	LIBEVORAL_API static const int32_t PPQN = 1920;
+
+	Beats() : _beats(0), _ticks(0) {}
+
+	/** Normalize so ticks is within PPQN. */
+	void normalize() {
+		// First, fix negative ticks with positive beats
+		if (_beats >= 0) {
+			while (_ticks < 0) {
+				--_beats;
+				_ticks += PPQN;
+			}
+		}
+
+		// Work with positive beats and ticks to normalize
+		const int32_t sign  = _beats < 0 ? -1 : 1;
+		int32_t       beats = abs(_beats);
+		int32_t       ticks = abs(_ticks);
+
+		// Fix ticks greater than 1 beat
+		while (ticks >= PPQN) {
+			++beats;
+			ticks -= PPQN;
+		}
+
+		// Set fields with appropriate sign
+		_beats = sign * beats;
+		_ticks = sign * ticks;
+	}
+
+	/** Create from a precise BT time. */
+	explicit Beats(int32_t b, int32_t t) : _beats(b), _ticks(t) {
+		normalize();
+	}
+
+	/** Create from a real number of beats. */
+	explicit Beats(double time) {
+		double       whole;
+		const double frac = modf(time, &whole);
+
+		_beats = whole;
+		_ticks = frac * PPQN;
+	}
+
+	/** Create from an integer number of beats. */
+	static Beats beats(int32_t beats) {
+		return Beats(beats, 0);
+	}
+
+	/** Create from ticks at the standard PPQN. */
+	static Beats ticks(int32_t ticks) {
+		return Beats(0, ticks);
+	}
+
+	/** Create from ticks at a given rate.
+	 *
+	 * Note this can also be used to create from frames by setting ppqn to the
+	 * number of samples per beat.  Note the resulting Beats will, like all
+	 * others, have the default PPQN, so this is a potentially lossy
+	 * conversion.
+	 */
+	static Beats ticks_at_rate(int64_t ticks, uint32_t ppqn) {
+		return Beats(ticks / ppqn, (ticks % ppqn) * PPQN / ppqn);
+	}
+
+	Beats& operator=(double time) {
+		double       whole;
+		const double frac = modf(time, &whole);
+
+		_beats = whole;
+		_ticks = frac * PPQN;
+		return *this;
+	}
+
+	Beats& operator=(const Beats& other) {
+		_beats = other._beats;
+		_ticks = other._ticks;
+		return *this;
+	}
+
+	Beats round_to_beat() const {
+		return (_ticks >= (PPQN/2)) ? Beats (_beats + 1, 0) : Beats (_beats, 0);
+	}
+
+	Beats round_up_to_beat() const {
+		return (_ticks == 0) ? *this : Beats(_beats + 1, 0);
+	}
+
+	Beats round_down_to_beat() const {
+		return Beats(_beats, 0);
+	}
+
+	Beats snap_to(const Evoral::Beats& snap) const {
+		const double snap_time = snap.to_double();
+		return Beats(ceil(to_double() / snap_time) * snap_time);
+	}
+
+	inline bool operator==(const Beats& b) const {
+		return _beats == b._beats && _ticks == b._ticks;
+	}
+
+	inline bool operator==(double t) const {
+		/* Acceptable tolerance is 1 tick. */
+		return fabs(to_double() - t) <= (1.0 / PPQN);
+	}
+
+	inline bool operator==(int beats) const {
+		return _beats == beats;
+	}
+
+	inline bool operator!=(const Beats& b) const {
+		return !operator==(b);
+	}
+
+	inline bool operator<(const Beats& b) const {
+		return _beats < b._beats || (_beats == b._beats && _ticks < b._ticks);
+	}
+
+	inline bool operator<=(const Beats& b) const {
+		return _beats < b._beats || (_beats == b._beats && _ticks <= b._ticks);
+	}
+
+	inline bool operator>(const Beats& b) const {
+		return _beats > b._beats || (_beats == b._beats && _ticks > b._ticks);
+	}
+
+	inline bool operator>=(const Beats& b) const {
+		return _beats > b._beats || (_beats == b._beats && _ticks >= b._ticks);
+	}
+
+	inline bool operator<(double b) const {
+		/* Acceptable tolerance is 1 tick. */
+		const double time = to_double();
+		if (fabs(time - b) <= (1.0 / PPQN)) {
+			return false;  /* Effectively identical. */
+		} else {
+			return time < b;
+		}
+	}
+
+	inline bool operator<=(double b) const {
+		return operator==(b) || operator<(b);
+	}
+
+	inline bool operator>(double b) const {
+		/* Acceptable tolerance is 1 tick. */
+		const double time = to_double();
+		if (fabs(time - b) <= (1.0 / PPQN)) {
+			return false;  /* Effectively identical. */
+		} else {
+			return time > b;
+		}
+	}
+
+	inline bool operator>=(double b) const {
+		return operator==(b) || operator>(b);
+	}
+
+	Beats operator+(const Beats& b) const {
+		return Beats(_beats + b._beats, _ticks + b._ticks);
+	}
+
+	Beats operator-(const Beats& b) const {
+		return Beats(_beats - b._beats, _ticks - b._ticks);
+	}
+
+	Beats operator+(double d) const {
+		return Beats(to_double() + d);
+	}
+
+	Beats operator-(double d) const {
+		return Beats(to_double() - d);
+	}
+
+	Beats operator+(int b) const {
+		return Beats (_beats + b, _ticks);
+	}
+
+	Beats operator-(int b) const {
+		return Beats (_beats - b, _ticks);
+	}
+
+	Beats& operator+=(int b) {
+		_beats += b;
+		return *this;
+	}
+
+	Beats& operator-=(int b) {
+		_beats -= b;
+		return *this;
+	}
+
+	Beats operator-() const {
+		return Beats(-_beats, -_ticks);
+	}
+
+	template<typename Number>
+	Beats operator*(Number factor) const {
+		return Beats(_beats * factor, _ticks * factor);
+	}
+
+	template<typename Number>
+	Beats operator/(Number factor) const {
+		return ticks ((_beats * PPQN + _ticks) / factor);
+	}
+
+	Beats& operator+=(const Beats& b) {
+		_beats += b._beats;
+		_ticks += b._ticks;
+		normalize();
+		return *this;
+	}
+
+	Beats& operator-=(const Beats& b) {
+		_beats -= b._beats;
+		_ticks -= b._ticks;
+		normalize();
+		return *this;
+	}
+
+	double  to_double()              const { return (double)_beats + (_ticks / (double)PPQN); }
+	int64_t to_ticks()               const { return (int64_t)_beats * PPQN + _ticks; }
+	int64_t to_ticks(uint32_t ppqn)  const { return (int64_t)_beats * ppqn + (_ticks * ppqn / PPQN); }
+
+	int32_t get_beats() const { return _beats; }
+	int32_t get_ticks() const { return _ticks; }
+
+	bool operator!() const { return _beats == 0 && _ticks == 0; }
+
+	static Beats tick() { return Beats(0, 1); }
+
+private:
+	int32_t _beats;
+	int32_t _ticks;
+};
+
+/*
+  TIL, several horrible hours later, that sometimes the compiler looks in the
+  namespace of a type (Evoral::Beats in this case) for an operator, and
+  does *NOT* look in the global namespace.
+
+  C++ is proof that hell exists and we are living in it.  In any case, move
+  these to the global namespace and PBD::Property's loopy
+  virtual-method-in-a-template will bite you.
+*/
+
+inline std::ostream&
+operator<<(std::ostream& os, const Beats& t)
+{
+	os << t.get_beats() << '.' << t.get_ticks();
+	return os;
+}
+
+inline std::istream&
+operator>>(std::istream& is, Beats& t)
+{
+	double beats;
+	is >> beats;
+	t = Beats(beats);
+	return is;
+}
+
+} // namespace Evoral
+
+namespace PBD {
+	namespace DEBUG {
+		LIBEVORAL_API extern uint64_t Beats;
+	}
+}
+
+namespace std {
+	template<>
+	struct numeric_limits<Evoral::Beats> {
+		static Evoral::Beats lowest() {
+			return Evoral::Beats(std::numeric_limits<int32_t>::min(),
+			                     std::numeric_limits<int32_t>::min());
+		}
+
+		/* We don't define min() since this has different behaviour for integral and floating point types,
+		   but Beats is used as both.  Better to avoid providing a min at all
+		   than a confusing one. */
+
+		static Evoral::Beats max() {
+			return Evoral::Beats(std::numeric_limits<int32_t>::max(),
+			                     std::numeric_limits<int32_t>::max());
+		}
+	};
+}
+
+#endif // EVORAL_BEATS_HPP

libs/temporal/temporal/types.h

@@ -0,0 +1,46 @@
+/*
+    Copyright (C) 2017 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __libpbd_position_types_h__
+#define __libpbd_position_types_h__
+
+#include <stdint.h>
+
+namespace PBD {
+
+/* Any position measured in audio samples.
+   Assumed to be non-negative but not enforced.
+*/
+typedef int64_t samplepos_t;
+
+/* Any distance from a given samplepos_t.
+   Maybe positive or negative.
+*/
+typedef int64_t sampleoffset_t;
+
+/* Any count of audio samples.
+   Assumed to be positive but not enforced.
+*/
+typedef int64_t samplecnt_t;
+
+static const samplepos_t max_samplepos = INT64_MAX;
+static const samplecnt_t max_samplecnt = INT64_MAX;
+
+}
+
+#endif /* __libpbd_position_types_h__ */

libs/temporal/types.h

@@ -0,0 +1,46 @@
+/*
+    Copyright (C) 2017 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __libpbd_position_types_h__
+#define __libpbd_position_types_h__
+
+#include <stdint.h>
+
+namespace PBD {
+
+/* Any position measured in audio samples.
+   Assumed to be non-negative but not enforced.
+*/
+typedef int64_t samplepos_t;
+
+/* Any distance from a given samplepos_t.
+   Maybe positive or negative.
+*/
+typedef int64_t sampleoffset_t;
+
+/* Any count of audio samples.
+   Assumed to be positive but not enforced.
+*/
+typedef int64_t samplecnt_t;
+
+static const samplepos_t max_samplepos = INT64_MAX;
+static const samplecnt_t max_samplecnt = INT64_MAX;
+
+}
+
+#endif /* __libpbd_position_types_h__ */