X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Ftypes.h;h=c34869bc2b5ca407fa97665d5930d90b8511491e;hb=8de887f378b13e558bdd74e88be79dc96df9d7b4;hp=d5189622884b8580eb493a0e90e16ec32881bad7;hpb=d9a3c6b89fde94b3632d1af57dd85ef9fc32f630;p=ardour.git

diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index d518962288..c34869bc2b 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -75,12 +75,15 @@ namespace ARDOUR {
 
 	static const framepos_t max_framepos = INT64_MAX;
 	static const framecnt_t max_framecnt = INT64_MAX;
+	static const layer_t    max_layer    = UINT32_MAX;
 
 	// a set of (time) intervals: first of pair is the offset of the start within the region, second is the offset of the end
 	typedef std::list<std::pair<frameoffset_t, frameoffset_t> > AudioIntervalResult;
 	// associate a set of intervals with regions (e.g. for silence detection)
 	typedef std::map<boost::shared_ptr<ARDOUR::Region>,AudioIntervalResult> AudioIntervalMap;
 
+	typedef std::list<boost::shared_ptr<Region> > RegionList;
+
 	struct IOChange {
 
 		enum Type {
@@ -353,9 +356,9 @@ namespace ARDOUR {
 	};
 
 	enum MonitorModel {
-		HardwareMonitoring,
-		SoftwareMonitoring,
-		ExternalMonitoring
+		HardwareMonitoring, ///< JACK does monitoring
+		SoftwareMonitoring, ///< Ardour does monitoring
+		ExternalMonitoring  ///< we leave monitoring to the audio hardware
 	};
 
 	enum MonitorChoice {
@@ -371,6 +374,11 @@ namespace ARDOUR {
 		MonitoringDisk = 0x4,
 	};
 
+	enum MeterState {
+		MeteringInput, ///< meter the input IO, regardless of what is going through the route
+		MeteringRoute  ///< meter what is going through the route
+	};
+
 	enum PFLPosition {
 		/** PFL signals come from before pre-fader processors */
 		PFLFromBeforeProcessors,
@@ -403,12 +411,6 @@ namespace ARDOUR {
 		ShortCrossfade
 	};
 
-	enum LayerModel {
-		LaterHigher,
-		MoveAddHigher,
-		AddHigher
-	};
-
 	enum ListenPosition {
 		AfterFaderListen,
 		PreFaderListen
@@ -602,7 +604,6 @@ std::istream& operator>>(std::istream& o, ARDOUR::PFLPosition& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::AFLPosition& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::RemoteModel& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::ListenPosition& sf);
-std::istream& operator>>(std::istream& o, ARDOUR::LayerModel& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::InsertMergePolicy& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::CrossfadeModel& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::SyncSource& sf);
@@ -623,7 +624,6 @@ std::ostream& operator<<(std::ostream& o, const ARDOUR::PFLPosition& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::AFLPosition& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::RemoteModel& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::ListenPosition& sf);
-std::ostream& operator<<(std::ostream& o, const ARDOUR::LayerModel& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::InsertMergePolicy& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::CrossfadeModel& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::SyncSource& sf);