smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

Match request in function names to the eventual call to jack_port_request_monitor.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11063 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-12-23 01:11:41 +00:00
parent d26260f51d
commit 15aa81fe70
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/audio_diskstream.h
View file

@ -159,7 +159,7 @@ class AudioDiskstream : public Diskstream
std::string name; std::string name;
bool is_physical () const; bool is_physical () const;
void ensure_monitor_input (bool) const; void request_jack_monitors_input (bool) const;
}; };
/** Information about one of our channels */ /** Information about one of our channels */

2
libs/ardour/ardour/audioengine.h
View file

@ -165,7 +165,7 @@ public:
int unregister_port (boost::shared_ptr<Port>); int unregister_port (boost::shared_ptr<Port>);
bool port_is_physical (const std::string&) const; 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); void split_cycle (pframes_t offset);

10
libs/ardour/audio_diskstream.cc
View file

@ -1686,7 +1686,7 @@ AudioDiskstream::engage_record_enable ()
if (Config->get_monitoring_model() == HardwareMonitoring) { if (Config->get_monitoring_model() == HardwareMonitoring) {
for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) { 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); capturing_sources.push_back ((*chan)->write_source);
(*chan)->write_source->mark_streaming_write_started (); (*chan)->write_source->mark_streaming_write_started ();
} }
@ -1708,7 +1708,7 @@ AudioDiskstream::disengage_record_enable ()
boost::shared_ptr<ChannelList> c = channels.reader(); boost::shared_ptr<ChannelList> c = channels.reader();
if (Config->get_monitoring_model() == HardwareMonitoring) { if (Config->get_monitoring_model() == HardwareMonitoring) {
for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) { 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 (); capturing_sources.clear ();
@ -1978,7 +1978,7 @@ AudioDiskstream::monitor_input (bool yn)
boost::shared_ptr<ChannelList> c = channels.reader(); boost::shared_ptr<ChannelList> c = channels.reader();
for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) { 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 void
AudioDiskstream::ChannelSource::ensure_monitor_input (bool yn) const AudioDiskstream::ChannelSource::request_jack_monitors_input (bool yn) const
{ {
if (name.empty()) { if (name.empty()) {
return; 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) AudioDiskstream::ChannelInfo::ChannelInfo (framecnt_t playback_bufsize, framecnt_t capture_bufsize, framecnt_t speed_size, framecnt_t wrap_size)

2
libs/ardour/audioengine.cc
View file

@ -1492,7 +1492,7 @@ AudioEngine::port_is_physical (const std::string& portname) const
} }
void 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); GET_PRIVATE_JACK_POINTER(_jack);