From 59989eed3aae9a882fbcc6271098158b761c686a Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Thu, 21 Aug 2025 17:53:17 +0200
Subject: [PATCH] Consolidate PI type flags across projects

This is to prevent future conflicts of flags..
---
 libs/ardour/ardour/presentation_info.h | 29 ++++++++++++++++++--------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/libs/ardour/ardour/presentation_info.h b/libs/ardour/ardour/presentation_info.h
index 009a8727c4..9f7d49c025 100644
--- a/libs/ardour/ardour/presentation_info.h
+++ b/libs/ardour/ardour/presentation_info.h
@@ -119,34 +119,45 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful
 		/* single bit indicates that the group order is set */
 		OrderSet = 0x400,
 
-#ifdef MIXBUS
+		/* Mixbus specific */
 		MixbusEditorHidden = 0x800,
 		Mixbus = 0x1000,
-#endif
+
 		/* bus type for monitor mixes */
 		FoldbackBus = 0x2000,
 
 		/* has TriggerBox, show on TriggerUI page */
 		TriggerTrack = 0x4000,
 
+#ifndef VBM
 		/* bus is the surround master */
 		SurroundMaster = 0x8000,
-
-		/* special mask to delect out "state" bits */
-#ifdef MIXBUS
-		StatusMask = (Hidden | MixbusEditorHidden | TriggerTrack),
 #else
-		StatusMask = (Hidden | TriggerTrack),
+		SurroundMaster = 0, // for compatibility
 #endif
 
+		/* VBM */
+		V2Program   = 0x4000,  // deprecated (conflicts with TriggerTrack)
+		V2MixMinus  = 0x8000,  // deprecated (conflicts with SurroundMaster)
+		VBMProgram  = 0x10000,
+		VBMMixMinus = 0x20000,
+#ifdef VBM
+		VBMAny      = 0x3c000,
+#else
+		VBMAny      = 0x30000,
+#endif
+
+		/* special mask to detect out "state" bits */
+		StatusMask = (Hidden | MixbusEditorHidden | TriggerTrack),
+
 		/* dedicated [output] busses */
 		MainBus = (MasterOut|MonitorOut|FoldbackBus|SurroundMaster),
 
 		/* These can exist only once and require special attention to be removed */
 		Singleton = (MasterOut|MonitorOut|SurroundMaster),
 
-		/* special mask to delect select type bits */
-		TypeMask = (AudioBus|AudioTrack|MidiTrack|MidiBus|VCA|MasterOut|MonitorOut|Auditioner|FoldbackBus|SurroundMaster)
+		/* special mask to detect select type bits */
+		TypeMask = (AudioBus|AudioTrack|MidiTrack|MidiBus|Mixbus|VCA|MasterOut|MonitorOut|Auditioner|FoldbackBus|SurroundMaster|VBMAny)
 	};
 
 	static const Flag AllStripables; /* mask to use for any route or VCA (but not auditioner) */