Merging from trunk

[ardour.git] / libs / ardour / ardour / types.h

diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 3d7ab4b59a35be30d89187b9da92d56c9b053c8e..a0a209b569248ee87a6a40cb65b0c7e22944216d 100644 (file)
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -29,6 +29,7 @@
 
 #include <inttypes.h>
 #include <jack/types.h>
+#include <control_protocol/smpte.h>
 #include <map>
 
 #if __GNUC__ < 3
@@ -98,34 +99,7 @@ namespace ARDOUR {
                Normal,
                Destructive
        };
-
-       enum smpte_wrap_t {
-               smpte_wrap_none = 0,
-               smpte_wrap_frames,
-               smpte_wrap_seconds,
-               smpte_wrap_minutes,
-               smpte_wrap_hours
-       };
-
-       struct SMPTE_Time {
-               bool negative;
-               uint32_t hours;
-               uint32_t minutes;
-               uint32_t seconds;
-               uint32_t frames;
-               uint32_t subframes; // mostly not used
-
-               SMPTE_Time() {
-                       negative = false;
-                       hours = 0;
-                       minutes = 0;
-                       seconds = 0;
-                       frames = 0;
-                       subframes = 0;
-               }
-               
-       };
-
+       
        struct BBT_Time {
            uint32_t bars;
            uint32_t beats;
@@ -164,7 +138,7 @@ namespace ARDOUR {
 
            Type type;
 
-           SMPTE_Time     smpte;
+           SMPTE::Time    smpte;
            BBT_Time       bbt;
 
            union { 
@@ -255,10 +229,18 @@ namespace ARDOUR {
                BWF,
                WAVE,
                WAVE64,
+               CAF,
+               AIFF,
                iXML,
                RF64
        };
 
+       struct PeakData {
+           typedef Sample PeakDatum;
+           
+           PeakDatum min;
+           PeakDatum max;
+       };
 };
 
 std::istream& operator>>(std::istream& o, ARDOUR::SampleFormat& sf);