Do some renaming in the ARDOUR::Port class tree.

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

diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h
index 96c18442b7d77be42c4697b90ec5c4509e31ef8f..bbf61b00fc00875e766b8669e52a6168ee0c8e18 100644 (file)
--- a/libs/ardour/ardour/port.h
+++ b/libs/ardour/ardour/port.h
@@ -90,11 +90,11 @@ public:
        virtual int connect (Port *);
        int disconnect (Port *);
 
-       void ensure_monitor_input (bool);
-       bool monitoring_input () const;
+       void ensure_jack_monitors_input (bool);
+       bool jack_monitoring_input () const;
        int reestablish ();
        int reconnect ();
-       void request_monitor_input (bool);
+       void request_jack_monitors_input (bool);
 
        bool last_monitor() const { return _last_monitor; }
        void set_last_monitor (bool yn) { _last_monitor = yn; }

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 7d93c0c68bea206c4e2c737520d757ccb552fa7a..cba946e840d12ceb188b5ee3de49fbac4e9fe389 100644 (file)
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -118,7 +118,6 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
        virtual int silent_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
                                 bool& need_butler);
 
-       virtual void toggle_monitor_input ();
        virtual bool can_record() { return false; }
 
        virtual void set_record_enabled (bool /*yn*/, void * /*src*/) {}

diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index f0492401d9437c50449705140bf600cf5590fb2a..5e8ced7d42d8b7365daf9d46ed2074ec418e86cd 100644 (file)
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -63,7 +63,6 @@ class Track : public Route, public PublicDiskstream
                          int declick, bool& need_butler) = 0;
 
        bool needs_butler() const { return _needs_butler; }
-       void toggle_monitor_input ();
 
        virtual DataType data_type () const = 0;
 

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index c6cb20bc4d430c01d31d37c76a3ebff07b55f4ac..17b1e31894962caf8659eb331570a12d594058b6 100644 (file)
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -537,7 +537,7 @@ AudioEngine::process_callback (pframes_t nframes)
 
                        bool x;
 
-                       if ((*i)->last_monitor() != (x = (*i)->monitoring_input ())) {
+                       if ((*i)->last_monitor() != (x = (*i)->jack_monitoring_input ())) {
                                (*i)->set_last_monitor (x);
                                /* XXX I think this is dangerous, due to
                                   a likely mutex in the signal handlers ...

diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 950e2b5e612bbc6d44019ee775a634a0c6ba34da..093d77f19d966e01a7f5825eda70e7a9b0b911c8 100644 (file)
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -1200,7 +1200,7 @@ MidiDiskstream::engage_record_enable ()
        boost::shared_ptr<MidiPort> sp = _source_port.lock ();
        
        if (sp && Config->get_monitoring_model() == HardwareMonitoring) {
-               sp->request_monitor_input (!(_session.config.get_auto_input() && rolling));
+               sp->request_jack_monitors_input (!(_session.config.get_auto_input() && rolling));
        }
 
        RecordEnableChanged (); /* EMIT SIGNAL */
@@ -1378,7 +1378,7 @@ MidiDiskstream::monitor_input (bool yn)
        boost::shared_ptr<MidiPort> sp = _source_port.lock ();
        
        if (sp) {
-               sp->ensure_monitor_input (yn);
+               sp->ensure_jack_monitors_input (yn);
        }
 }
 

diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index f36984a523f46d5882a69bb2763627f79abc2a11..d6c959df30e0c78cc6713c73fe0b1addf2bded30 100644 (file)
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -212,13 +212,13 @@ Port::set_engine (AudioEngine* e)
 }
 
 void
-Port::ensure_monitor_input (bool yn)
+Port::ensure_jack_monitors_input (bool yn)
 {
        jack_port_ensure_monitor (_jack_port, yn);
 }
 
 bool
-Port::monitoring_input () const
+Port::jack_monitoring_input () const
 {
        return jack_port_monitoring_input (_jack_port);
 }
@@ -459,7 +459,7 @@ Port::set_name (std::string const & n)
 }
 
 void
-Port::request_monitor_input (bool yn)
+Port::request_jack_monitors_input (bool yn)
 {
        jack_port_request_monitor (_jack_port, yn);
 }

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index c97421a472ce8ed09165be830510a2a19f84cf6b..f39b094ccd97ffc4143e6db906d1b01b1a51a36c 100644 (file)
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -2844,14 +2844,6 @@ Route::silent_roll (pframes_t nframes, framepos_t /*start_frame*/, framepos_t /*
        return 0;
 }
 
-void
-Route::toggle_monitor_input ()
-{
-       for (PortSet::iterator i = _input->ports().begin(); i != _input->ports().end(); ++i) {
-               i->ensure_monitor_input( ! i->monitoring_input());
-       }
-}
-
 bool
 Route::has_external_redirects () const
 {

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 4ae75da54dd527691031e8a5bdc8189e481b02a0..c0468c9af42de728b96892b32d09567e5052abf5 100644 (file)
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -182,14 +182,6 @@ Track::get_template ()
        return state (false);
 }
 
-void
-Track::toggle_monitor_input ()
-{
-       for (PortSet::iterator i = _input->ports().begin(); i != _input->ports().end(); ++i) {
-               i->ensure_monitor_input(!i->monitoring_input());
-       }
-}
-
 Track::FreezeRecord::~FreezeRecord ()
 {
        for (vector<FreezeRecordProcessorInfo*>::iterator i = processor_info.begin(); i != processor_info.end(); ++i) {