X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Ftypes.h;h=ce284845191ac667cb05cbf296499f8e8a2a485a;hb=ac325cea25ed8fef467ae7888da131d1d166b960;hp=5bd7b879290c416f0c0a99950f458b3c8c489068;hpb=239da0efb58849e545ec44aeb839d41b8e4792cf;p=ardour.git

diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 5bd7b87929..ce28484519 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -52,6 +52,9 @@ namespace ARDOUR {
 	class AudioSource;
 	class Route;
 	class Region;
+	class Stripable;
+	class VCA;
+	class AutomationControl;
 
 	typedef float    Sample;
 	typedef float    pan_t;
@@ -117,6 +120,13 @@ namespace ARDOUR {
 	};
 
 	/** See evoral/Parameter.hpp
+	 *
+	 * When you add things here, you REALLY SHOULD add a case clause to
+	 * the constructor of ParameterDescriptor, unless the Controllables
+	 * that the enum refers to are completely standard (0-1.0 range, 0.0 as
+	 * normal, non-toggled, non-enumerated). Anything else needs to be
+	 * added there so that things that try to represent them can do so
+	 * with as much information as possible.
 	 */
 	enum AutomationType {
 		NullAutomation,
@@ -129,6 +139,8 @@ namespace ARDOUR {
 		PluginAutomation,
 		PluginPropertyAutomation,
 		SoloAutomation,
+		SoloIsolateAutomation,
+		SoloSafeAutomation,
 		MuteAutomation,
 		MidiCCAutomation,
 		MidiPgmChangeAutomation,
@@ -139,7 +151,24 @@ namespace ARDOUR {
 		FadeOutAutomation,
 		EnvelopeAutomation,
 		RecEnableAutomation,
+		RecSafeAutomation,
 		TrimAutomation,
+		PhaseAutomation,
+		MonitoringAutomation,
+		EQGain,
+		EQFrequency,
+		EQQ,
+		EQShape,
+		EQHPF,
+		EQEnable,
+		CompThreshold,
+		CompSpeed,
+		CompMode,
+		CompMakeup,
+		CompRedux,
+		CompEnable,
+		BusSendLevel,
+		BusSendEnable,
 	};
 
 	enum AutoState {
@@ -293,7 +322,7 @@ namespace ARDOUR {
 
 		AudioRange (framepos_t s, framepos_t e, uint32_t i) : start (s), end (e) , id (i) {}
 
-		framecnt_t length() { return end - start + 1; }
+		framecnt_t length() const { return end - start + 1; }
 
 		bool operator== (const AudioRange& other) const {
 			return start == other.start && end == other.end && id == other.id;
@@ -437,11 +466,6 @@ namespace ARDOUR {
 		DenormalFTZDAZ
 	};
 
-	enum RemoteModel {
-		UserOrdered,
-		MixerOrdered
-	};
-
 	enum LayerModel {
 		LaterHigher,
 		Manual
@@ -457,7 +481,7 @@ namespace ARDOUR {
 		AutoConnectPhysical = 0x1,
 		AutoConnectMaster = 0x2
 	};
-        
+
     enum TracksAutoNamingRule {
         UseDefaultNames = 0x1,
         NameAfterDriver = 0x2
@@ -538,7 +562,12 @@ namespace ARDOUR {
 	typedef std::list<framepos_t> AnalysisFeatureList;
 
 	typedef std::list<boost::shared_ptr<Route> > RouteList;
+	typedef std::list<boost::shared_ptr<Stripable> > StripableList;
 	typedef std::list<boost::weak_ptr  <Route> > WeakRouteList;
+	typedef std::list<boost::weak_ptr  <Stripable> > WeakStripableList;
+	typedef std::list<boost::shared_ptr<AutomationControl> > ControlList;
+
+	typedef std::list<boost::shared_ptr<VCA> > VCAList;
 
 	class Bundle;
 	typedef std::vector<boost::shared_ptr<Bundle> > BundleList;
@@ -610,8 +639,8 @@ namespace ARDOUR {
 		   this equality cannot be assumed.
 		*/
 		TransportStopped = 0,
-		TransportRolling = 1, 
-		TransportLooping = 2, 
+		TransportRolling = 1,
+		TransportLooping = 2,
 		TransportStarting = 3,
 	};
 
@@ -619,7 +648,7 @@ namespace ARDOUR {
 		/* these values happen to match the constants used by JACK but
 		   this equality cannot be assumed.
 		*/
-		IsInput = 0x1, 
+		IsInput = 0x1,
 		IsOutput = 0x2,
 		IsPhysical = 0x4,
 		CanMonitor = 0x8,
@@ -645,6 +674,12 @@ namespace ARDOUR {
 		RegionSelectionStart = 0x8,
 	};
 
+	enum PlaylistDisposition {
+		CopyPlaylist,
+		NewPlaylist,
+		SharePlaylist
+	};
+
 } // namespace ARDOUR
 
 
@@ -659,7 +694,6 @@ std::istream& operator>>(std::istream& o, ARDOUR::EditMode& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::MonitorModel& sf);
 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);
@@ -683,7 +717,6 @@ std::ostream& operator<<(std::ostream& o, const ARDOUR::EditMode& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::MonitorModel& sf);
 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);
@@ -730,7 +763,7 @@ session_frame_to_track_frame (ARDOUR::framepos_t session_frame, double speed)
 static inline ARDOUR::framepos_t
 track_frame_to_session_frame (ARDOUR::framepos_t track_frame, double speed)
 {
-	/* NB - do we need a check for speed == 0 ??? */ 
+	/* NB - do we need a check for speed == 0 ??? */
 	long double result = (long double) track_frame / (long double) speed;
 
 	if (result >= (long double) ARDOUR::max_framepos) {
@@ -748,4 +781,3 @@ using ARDOUR::framepos_t;
 
 
 #endif /* __ardour_types_h__ */
-