Merged with trunk R1283.

NOTE: Compiles, but broken (crash on adding MIDI track).


git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 16 deletions

diff --git a/libs/surfaces/control_protocol/control_protocol/smpte.h b/libs/surfaces/control_protocol/control_protocol/smpte.h
index 09c1c9616a..b25a268aac 100644
--- a/libs/surfaces/control_protocol/control_protocol/smpte.h
+++ b/libs/surfaces/control_protocol/control_protocol/smpte.h
@@ -31,28 +31,18 @@ enum Wrap {
 	HOURS
 };
 
-/** SMPTE frame rate (in frames per second).
- *
- * This should be eliminated in favour of a float to support arbitrary rates.
- */
-enum FPS {
-    MTC_24_FPS = 0,
-    MTC_25_FPS = 1,
-    MTC_30_FPS_DROP = 2,
-    MTC_30_FPS = 3
-};
-
 struct Time {
 	bool       negative;
 	uint32_t   hours;
 	uint32_t   minutes;
 	uint32_t   seconds;
-	uint32_t   frames;       ///< SMPTE frames (not audio samples)
-	uint32_t   subframes;    ///< Typically unused
-	FPS        rate;         ///< Frame rate of this Time
-	static FPS default_rate; ///< Rate to use for default constructor
+	uint32_t   frames;        ///< SMPTE frames (not audio samples)
+	uint32_t   subframes;     ///< Typically unused
+	float      rate;          ///< Frame rate of this Time
+	static float default_rate;///< Rate to use for default constructor
+	bool       drop;          ///< Whether this Time uses dropframe SMPTE
 
-	Time(FPS a_rate = default_rate) {
+	Time(float a_rate = default_rate) {
 		negative = false;
 		hours = 0;
 		minutes = 0;