new internal port type, round I, plus tiny fix for legalize_for_xml() (also for 2...

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

diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index cfb9dd49b07f770b5a06c46a63dd709966dfd2ce..0c5a8e044f080a55cbb8d64043812224b627f96e 100644 (file)
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -61,21 +61,6 @@ namespace ARDOUR {
 
        typedef unsigned char Byte;
 
-       /** Identical to jack_midi_event_t, but with double timestamp
-        *
-        * time is either a frame time (from/to Jack) or a beat time (internal
-        * tempo time, used in MidiModel) depending on context.
-        */
-       struct MidiEvent {
-               MidiEvent(double t=0, size_t s=0, Byte* b=NULL)
-               : time(t), size(s), buffer(b)
-               {}
-               
-               double time;   /**< Sample index (or beat time) at which event is valid */
-               size_t size;   /**< Number of bytes of data in \a buffer */
-               Byte*  buffer; /**< Raw MIDI data */
-       };
-
        enum IOChange {
                NoChange = 0,
                ConfigurationChanged = 0x1,
@@ -143,6 +128,11 @@ namespace ARDOUR {
                Destructive
        };
        
+       enum NoteMode {
+               Sustained,
+               Percussive
+       };
+       
        struct BBT_Time {
            uint32_t bars;
            uint32_t beats;
@@ -335,7 +325,8 @@ namespace ARDOUR {
 
        enum SampleFormat {
                FormatFloat = 0,
-               FormatInt24
+               FormatInt24,
+               FormatInt16
        };
 
 
@@ -379,6 +370,20 @@ namespace ARDOUR {
        };
 
        typedef std::vector<boost::shared_ptr<Source> > SourceList;
+
+       enum SrcQuality {
+               SrcBest,
+               SrcGood,
+               SrcQuick,
+               SrcFast,
+               SrcFastest
+       };
+
+       enum PortType {
+               Jack,
+               Internal
+       };
+
 } // namespace ARDOUR
 
 std::istream& operator>>(std::istream& o, ARDOUR::SampleFormat& sf);