add "custom" meter option which is the only option where the meter processor is visible in the UI; hide main outs always

git-svn-id: svn://localhost/ardour2/branches/3.0@6126 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 6 insertions, 8 deletions

diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index beccab73ae..add222a0f1 100644
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -61,7 +61,6 @@ public:
 	bool set_name (const std::string& name);
 	std::string display_name() const;
 
-	bool visible() const;
 	Role role() const { return _role; }
 	bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
 	bool configure_io (ChanCount in, ChanCount out);
diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index be8472b170..10272ee733 100644
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -53,10 +53,7 @@ public:
 	PeakMeter(Session& s) : Processor(s, "Meter") {}
 	PeakMeter(Session&s, const XMLNode& node);
 
-	bool visible() const;
-
 	void meter();
-
 	void reset ();
 	void reset_max ();
 
diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h
index 473bb97130..3ec4a9885d 100644
--- a/libs/ardour/ardour/processor.h
+++ b/libs/ardour/ardour/processor.h
@@ -56,8 +56,8 @@ class Processor : public SessionObject, public AutomatableControls, public Laten
 
 	virtual std::string display_name() const { return SessionObject::name(); }
 
-	virtual bool visible() const { return true; }
-	virtual void set_visible (bool) {}
+	virtual bool display_to_user() const { return _display_to_user; }
+	virtual void set_display_to_user (bool);
 
 	bool active () const { return _pending_active; }
 
@@ -109,6 +109,7 @@ protected:
 	ChanCount _configured_input;
 	ChanCount _configured_output;
 	void*     _gui;  /* generic, we don't know or care what this is */
+	bool        _display_to_user;
 
 private:
 	int set_state_2X (const XMLNode&, int version);
diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index f9f13ee309..b86d321bd2 100644
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -43,7 +43,7 @@ class Send : public Delivery
 
 	uint32_t bit_slot() const { return _bitslot; }
 
-	bool visible() const;
+	bool display_to_user() const;
 
 	boost::shared_ptr<Amp> amp() const { return _amp; }
 	boost::shared_ptr<PeakMeter> meter() const { return _meter; }
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 7e09417409..75c4d20db4 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -127,7 +127,8 @@ namespace ARDOUR {
 	enum MeterPoint {
 		MeterInput,
 		MeterPreFader,
-		MeterPostFader
+		MeterPostFader,
+		MeterCustom
 	};
 
 	enum TrackMode {