Clarify ensure vs. request for JACK monitoring, naming-wise.

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

diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index afb6ecc9088c4b88d881501909e49681439eaab1..be43142f218b189bc2dcf97f6eb86d708ff55099 100644 (file)
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -114,7 +114,7 @@ class AudioDiskstream : public Diskstream
        XMLNode& get_state(void);
        int      set_state(const XMLNode& node, int version);
 
-       void monitor_input (bool);
+       void request_jack_monitors_input (bool);
 
        static void swap_by_ptr (Sample *first, Sample *last) {
                while (first < last) {

diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 96bffae7231a808910a45838ee35eca1d07f8295..c51210265696110df472faf7ceeb6808ca2a5989 100644 (file)
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -132,7 +132,8 @@ class Diskstream : public SessionObject, public PublicDiskstream
        virtual XMLNode& get_state(void);
        virtual int      set_state(const XMLNode&, int version);
 
-       virtual void monitor_input (bool) {}
+       virtual void request_jack_monitors_input (bool) {}
+       virtual void ensure_jack_monitors_input (bool) {}
 
        framecnt_t   capture_offset() const { return _capture_offset; }
        virtual void set_capture_offset ();

diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index a7695b5ebfff985adecfc1e2fa3065bdb4e6a865..94eb56d9b5d4476f5a97077c1e658d773785dee0 100644 (file)
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -78,7 +78,7 @@ class MidiDiskstream : public Diskstream
        XMLNode& get_state(void);
        int set_state(const XMLNode&, int version);
 
-       void monitor_input (bool);
+       void ensure_jack_monitors_input (bool);
 
        boost::shared_ptr<SMFSource> write_source ()    { return _write_source; }
 

diff --git a/libs/ardour/ardour/public_diskstream.h b/libs/ardour/ardour/public_diskstream.h
index 3dadf2e8be776d6fc73f17e119ac1f84b112286e..da481a6deec4baa0eec9da1d6c44d366845deb48 100755 (executable)
--- a/libs/ardour/ardour/public_diskstream.h
+++ b/libs/ardour/ardour/public_diskstream.h
@@ -33,7 +33,8 @@ public:
        virtual ~PublicDiskstream() {}
 
        virtual boost::shared_ptr<Playlist> playlist () = 0;
-       virtual void monitor_input (bool) = 0;
+       virtual void request_jack_monitors_input (bool) = 0;
+       virtual void ensure_jack_monitors_input (bool) = 0;
        virtual bool destructive () const = 0;
        virtual std::list<boost::shared_ptr<Source> > & last_capture_sources () = 0;
        virtual void set_capture_offset () = 0;

diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 5e8ced7d42d8b7365daf9d46ed2074ec418e86cd..8f68f63d05e12baa8a635fa5a890fa270eff6f81 100644 (file)
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -109,7 +109,8 @@ class Track : public Route, public PublicDiskstream
 
        /* PublicDiskstream interface */
        boost::shared_ptr<Playlist> playlist ();
-       void monitor_input (bool);
+       void request_jack_monitors_input (bool);
+       void ensure_jack_monitors_input (bool);
        bool destructive () const;
        std::list<boost::shared_ptr<Source> > & last_capture_sources ();
        void set_capture_offset ();

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index f096a463efe421d2538c4b90124523319777f857..603179a8e288ec1adaa1d60c69e03b4532d5e5b1 100644 (file)
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -1973,7 +1973,7 @@ AudioDiskstream::allocate_temporary_buffers ()
 }
 
 void
-AudioDiskstream::monitor_input (bool yn)
+AudioDiskstream::request_jack_monitors_input (bool yn)
 {
        boost::shared_ptr<ChannelList> c = channels.reader();
 

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 74be81c909877ca3e27386aed296ec5e3574f27b..458738bddb0f93c446c4ed6faa8654fd2b41a394 100644 (file)
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -100,7 +100,7 @@ AudioTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
        }
 
        _diskstream->set_record_enabled (false);
-       _diskstream->monitor_input (false);
+       _diskstream->request_jack_monitors_input (false);
 
        DiskstreamChanged (); /* EMIT SIGNAL */
 }

diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 093d77f19d966e01a7f5825eda70e7a9b0b911c8..c1d391fa4ab4f71af0e81f5d71909a65dc4a089d 100644 (file)
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -1373,7 +1373,7 @@ MidiDiskstream::allocate_temporary_buffers ()
 }
 
 void
-MidiDiskstream::monitor_input (bool yn)
+MidiDiskstream::ensure_jack_monitors_input (bool yn)
 {
        boost::shared_ptr<MidiPort> sp = _source_port.lock ();
        

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index f2e224fee55887edabd1180406d8ce9d82d82556..9a4b4f65ed722f7d591425d3da7401eb2bcb4d46 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -782,7 +782,7 @@ Session::set_track_monitor_input_status (bool yn)
                boost::shared_ptr<AudioTrack> tr = boost::dynamic_pointer_cast<AudioTrack> (*i);
                if (tr && tr->record_enabled ()) {
                        //cerr << "switching to input = " << !auto_input << __FILE__ << __LINE__ << endl << endl;
-                       tr->monitor_input (yn);
+                       tr->request_jack_monitors_input (yn);
                }
        }
 }

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index c0468c9af42de728b96892b32d09567e5052abf5..fa19c3ddcc6fc6cb9c338144c96b87a23850d5b5 100644 (file)
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -484,9 +484,15 @@ Track::playlist ()
 }
 
 void
-Track::monitor_input (bool m)
+Track::request_jack_monitors_input (bool m)
 {
-       _diskstream->monitor_input (m);
+       _diskstream->request_jack_monitors_input (m);
+}
+
+void
+Track::ensure_jack_monitors_input (bool m)
+{
+       _diskstream->ensure_jack_monitors_input (m);
 }
 
 bool