smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-01 19:37:45 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11062 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-12-23 00:26:25 +00:00
parent 66532c0519
commit d26260f51d
8 changed files with 9 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/ardour/ardour/port.h
View file

@ -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; }

1
libs/ardour/ardour/route.h
View file

@ -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*/) {}

1
libs/ardour/ardour/track.h
View file

@ -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;

2
libs/ardour/audioengine.cc
View file

@ -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 ...

4
libs/ardour/midi_diskstream.cc
View file

@ -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);
}
}

6
libs/ardour/port.cc
View file

@ -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);
}

8
libs/ardour/route.cc
View file

@ -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
{

8
libs/ardour/track.cc
View file

@ -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) {