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 /libs/ardour/audio_diskstream.cc | |
| 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
Diffstat (limited to 'libs/ardour/audio_diskstream.cc')
| -rw-r--r-- | libs/ardour/audio_diskstream.cc | 10 |
1 files changed, 5 insertions, 5 deletions
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) |