Tidy up monitoring slightly so that it matches oofus' truth

table for the various different states.  Should fix #4533.


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

1 files changed, 3 insertions, 3 deletions

diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 8f68f63d05..08bf170985 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -50,9 +50,11 @@ class Track : public Route, public PublicDiskstream
 
 	virtual void set_monitoring (MonitorChoice);
 	MonitorChoice monitoring_choice() const { return _monitoring; }
-	MonitorState monitoring_state();
+	MonitorState monitoring_state () const;
 	PBD::Signal0<void> MonitoringChanged;
 
+	MeterState metering_state () const;
+	
 	virtual int no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
 	                     bool state_changing);
 
@@ -213,8 +215,6 @@ class Track : public Route, public PublicDiskstream
 
 	void maybe_declick (BufferSet&, framecnt_t, int);
 
-	virtual bool send_silence () const;
-
 	boost::shared_ptr<RecEnableControllable> _rec_enable_control;
 	
 	framecnt_t check_initial_delay (framecnt_t nframes, framecnt_t&);