merge from trunk

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

diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index a0a209b569248ee87a6a40cb65b0c7e22944216d..0a3a7b731c46c3c31fe48ad6e5fe753f14225ace 100644 (file)
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -30,6 +30,8 @@
 #include <inttypes.h>
 #include <jack/types.h>
 #include <control_protocol/smpte.h>
+#include <pbd/id.h>
+
 #include <map>
 
 #if __GNUC__ < 3
@@ -45,7 +47,7 @@ namespace ARDOUR {
        typedef float                       pan_t;
        typedef float                       gain_t;
        typedef uint32_t                    layer_t;
-       typedef uint64_t                    id_t;
+       typedef uint64_t                    microseconds_t;
 
        enum IOChange {
                NoChange = 0,
@@ -69,7 +71,7 @@ namespace ARDOUR {
                PanAutomation = 0x2,
                PluginAutomation = 0x4,
                SoloAutomation = 0x8,
-               MuteAutomation = 0x10,
+               MuteAutomation = 0x10
        };
 
        enum AutoState {
@@ -188,10 +190,10 @@ namespace ARDOUR {
 
        enum EditMode {
                Slide,
-               Splice,
+               Splice
        };
 
-        enum RegionPoint { 
+       enum RegionPoint { 
            Start,
            End,
            SyncPoint
@@ -241,7 +243,14 @@ namespace ARDOUR {
            PeakDatum min;
            PeakDatum max;
        };
-};
+       
+       enum PluginType {
+               AudioUnit,
+               LADSPA,
+               VST
+       };
+       
+} // namespace ARDOUR
 
 std::istream& operator>>(std::istream& o, ARDOUR::SampleFormat& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::HeaderFormat& sf);
@@ -252,7 +261,6 @@ session_frame_to_track_frame (jack_nframes_t session_frame, double speed)
        return (jack_nframes_t)( (double)session_frame * speed );
 }
 
-
 static inline jack_nframes_t
 track_frame_to_session_frame (jack_nframes_t track_frame, double speed)
 {