correctly track monitoring changes in libardour and the GUI; required removing propagation of session rec-enabled status through process chain and replacing it with call to Session::actively_recording() where necessary (may require a new RT event)

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

1 files changed, 5 insertions, 4 deletions

diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index b467ffb316..01b084641d 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -49,17 +49,18 @@ class Track : public Route, public PublicDiskstream
 	PBD::Signal0<void> TrackModeChanged;
 
 	virtual void set_monitoring (MonitorChoice);
-	MonitorChoice monitoring() const { return _monitoring; }
+	MonitorChoice monitoring_choice() const { return _monitoring; }
+	MonitorState monitoring_state();
 	PBD::Signal0<void> MonitoringChanged;
 
 	virtual int no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
-	                     bool state_changing, bool can_record);
+	                     bool state_changing);
 
 	int silent_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
-	                 bool can_record, bool& need_butler);
+	                 bool& need_butler);
 
 	virtual int roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
-	                  int declick, bool can_record, bool& need_butler) = 0;
+	                  int declick, bool& need_butler) = 0;
 
 	bool needs_butler() const { return _needs_butler; }
 	void toggle_monitor_input ();