Rename a few bits and fix a undeclared method.

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

diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index 018b5c4f601e33c17ccf49606726a79f8b861908..4270a3be97c9e6f501da23dc563f3e9203898145 100644 (file)
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -114,7 +114,7 @@ public:
 protected:
        XMLNode& state (bool full);
 
-       bool should_monitor () const;
+       bool ardour_should_monitor () const;
        bool send_silence () const;
 
        void act_on_mute ();

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index cba946e840d12ceb188b5ee3de49fbac4e9fe389..af659fd4cd578fa00f2b1551e111ed43bf6e7eaa 100644 (file)
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -494,7 +494,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
        uint32_t pans_required() const;
        ChanCount n_process_buffers ();
 
-       virtual bool should_monitor () const;
+       virtual bool ardour_should_monitor () const;
        virtual void maybe_declick (BufferSet&, framecnt_t, int);
 
        boost::shared_ptr<Amp>       _amp;

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 4b990b8175ef3ad1c1e40b709a0f4410c262a9b5..6048cb7e16f87b5df49c069717af3cb17405f02e 100644 (file)
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -653,7 +653,7 @@ MidiTrack::diskstream_data_recorded (boost::weak_ptr<MidiSource> src)
 }
 
 bool
-MidiTrack::should_monitor () const
+MidiTrack::ardour_should_monitor () const
 {
        return true;
 }

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index f39b094ccd97ffc4143e6db906d1b01b1a51a36c..10806767d34e7df0a868638efbd247d3bd6f02c2 100644 (file)
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -400,7 +400,7 @@ Route::process_output_buffers (BufferSet& bufs,
                               framepos_t start_frame, framepos_t end_frame, pframes_t nframes,
                               int declick, bool gain_automation_ok)
 {
-       bool monitor = should_monitor ();
+       bool monitor = ardour_should_monitor ();
 
        bufs.set_is_silent (false);
 
@@ -3846,8 +3846,9 @@ Route::setup_invisible_processors ()
        }
 }
 
+/** @return true if Ardour should provide monitoring for this route */
 bool
-Route::should_monitor () const
+Route::ardour_should_monitor () const
 {
        switch (Config->get_monitoring_model()) {
        case HardwareMonitoring:

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 9a4b4f65ed722f7d591425d3da7401eb2bcb4d46..37349cc5fb0cc2671f2697d2d94ca6c6c3e95807 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -787,16 +787,6 @@ Session::set_track_monitor_input_status (bool yn)
        }
 }
 
-void
-Session::reset_input_monitor_state ()
-{
-       if (transport_rolling()) {
-               set_track_monitor_input_status (Config->get_monitoring_model() == HardwareMonitoring && !config.get_auto_input());
-       } else {
-               set_track_monitor_input_status (Config->get_monitoring_model() == HardwareMonitoring);
-       }
-}
-
 void
 Session::auto_punch_start_changed (Location* location)
 {