diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-12-23 00:26:25 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-12-23 00:26:25 +0000 |
| commit | d26260f51dc8b699baf9a3976aa2458474322e8f (patch) | |
| tree | 075acb19a33527fc2e1e29a38b791e865e275a13 /libs/ardour/ardour | |
| parent | 66532c051926045654dcf4126e79ac52b08c3d2d (diff) | |
Do some renaming in the ARDOUR::Port class tree.
git-svn-id: svn://localhost/ardour2/branches/3.0@11062 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/port.h | 6 | ||||
| -rw-r--r-- | libs/ardour/ardour/route.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/track.h | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h index 96c18442b7..bbf61b00fc 100644 --- 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 7d93c0c68b..cba946e840 100644 --- 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 f0492401d9..5e8ced7d42 100644 --- 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; |