diff options
author | Carl Hetherington <carl@carlh.net> | 2011-12-23 01:11:41 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2011-12-23 01:11:41 +0000 |
commit | 15aa81fe70ce629cddcc75f0a0ddeb0db0d4439b (patch) | |
tree | 86de9671fcc33eb3460c049e8e34f3f9be17d2ad | |
parent | d26260f51dc8b699baf9a3976aa2458474322e8f (diff) |
Match request in function names to the eventual call to jack_port_request_monitor.
git-svn-id: svn://localhost/ardour2/branches/3.0@11063 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | libs/ardour/ardour/audio_diskstream.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/audioengine.h | 2 | ||||
-rw-r--r-- | libs/ardour/audio_diskstream.cc | 10 | ||||
-rw-r--r-- | libs/ardour/audioengine.cc | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h index ab7c27c4f3..afb6ecc908 100644 --- a/libs/ardour/ardour/audio_diskstream.h +++ b/libs/ardour/ardour/audio_diskstream.h @@ -159,7 +159,7 @@ class AudioDiskstream : public Diskstream std::string name; bool is_physical () const; - void ensure_monitor_input (bool) const; + void request_jack_monitors_input (bool) const; }; /** Information about one of our channels */ diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index a8534a7191..13bac48255 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -165,7 +165,7 @@ public: int unregister_port (boost::shared_ptr<Port>); bool port_is_physical (const std::string&) const; - void ensure_monitor_input (const std::string&, bool) const; + void request_jack_monitors_input (const std::string&, bool) const; void split_cycle (pframes_t offset); diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index 2ab7d9ec65..f096a463ef 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -1686,7 +1686,7 @@ AudioDiskstream::engage_record_enable () if (Config->get_monitoring_model() == HardwareMonitoring) { for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) { - (*chan)->source.ensure_monitor_input (!(_session.config.get_auto_input() && rolling)); + (*chan)->source.request_jack_monitors_input (!(_session.config.get_auto_input() && rolling)); capturing_sources.push_back ((*chan)->write_source); (*chan)->write_source->mark_streaming_write_started (); } @@ -1708,7 +1708,7 @@ AudioDiskstream::disengage_record_enable () boost::shared_ptr<ChannelList> c = channels.reader(); if (Config->get_monitoring_model() == HardwareMonitoring) { for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) { - (*chan)->source.ensure_monitor_input (false); + (*chan)->source.request_jack_monitors_input (false); } } capturing_sources.clear (); @@ -1978,7 +1978,7 @@ AudioDiskstream::monitor_input (bool yn) boost::shared_ptr<ChannelList> c = channels.reader(); for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) { - (*chan)->source.ensure_monitor_input (yn); + (*chan)->source.request_jack_monitors_input (yn); } } @@ -2301,13 +2301,13 @@ AudioDiskstream::ChannelSource::is_physical () const } void -AudioDiskstream::ChannelSource::ensure_monitor_input (bool yn) const +AudioDiskstream::ChannelSource::request_jack_monitors_input (bool yn) const { if (name.empty()) { return; } - return AudioEngine::instance()->ensure_monitor_input (name, yn); + return AudioEngine::instance()->request_jack_monitors_input (name, yn); } AudioDiskstream::ChannelInfo::ChannelInfo (framecnt_t playback_bufsize, framecnt_t capture_bufsize, framecnt_t speed_size, framecnt_t wrap_size) diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 17b1e31894..fa1d6fe175 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -1492,7 +1492,7 @@ AudioEngine::port_is_physical (const std::string& portname) const } void -AudioEngine::ensure_monitor_input (const std::string& portname, bool yn) const +AudioEngine::request_jack_monitors_input (const std::string& portname, bool yn) const { GET_PRIVATE_JACK_POINTER(_jack); |