summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/audio_diskstream.h2
-rw-r--r--libs/ardour/ardour/diskstream.h3
-rw-r--r--libs/ardour/ardour/midi_diskstream.h2
-rwxr-xr-xlibs/ardour/ardour/public_diskstream.h3
-rw-r--r--libs/ardour/ardour/track.h3
5 files changed, 8 insertions, 5 deletions
diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index afb6ecc908..be43142f21 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -114,7 +114,7 @@ class AudioDiskstream : public Diskstream
XMLNode& get_state(void);
int set_state(const XMLNode& node, int version);
- void monitor_input (bool);
+ void request_jack_monitors_input (bool);
static void swap_by_ptr (Sample *first, Sample *last) {
while (first < last) {
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 96bffae723..c512102656 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -132,7 +132,8 @@ class Diskstream : public SessionObject, public PublicDiskstream
virtual XMLNode& get_state(void);
virtual int set_state(const XMLNode&, int version);
- virtual void monitor_input (bool) {}
+ virtual void request_jack_monitors_input (bool) {}
+ virtual void ensure_jack_monitors_input (bool) {}
framecnt_t capture_offset() const { return _capture_offset; }
virtual void set_capture_offset ();
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index a7695b5ebf..94eb56d9b5 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -78,7 +78,7 @@ class MidiDiskstream : public Diskstream
XMLNode& get_state(void);
int set_state(const XMLNode&, int version);
- void monitor_input (bool);
+ void ensure_jack_monitors_input (bool);
boost::shared_ptr<SMFSource> write_source () { return _write_source; }
diff --git a/libs/ardour/ardour/public_diskstream.h b/libs/ardour/ardour/public_diskstream.h
index 3dadf2e8be..da481a6dee 100755
--- a/libs/ardour/ardour/public_diskstream.h
+++ b/libs/ardour/ardour/public_diskstream.h
@@ -33,7 +33,8 @@ public:
virtual ~PublicDiskstream() {}
virtual boost::shared_ptr<Playlist> playlist () = 0;
- virtual void monitor_input (bool) = 0;
+ virtual void request_jack_monitors_input (bool) = 0;
+ virtual void ensure_jack_monitors_input (bool) = 0;
virtual bool destructive () const = 0;
virtual std::list<boost::shared_ptr<Source> > & last_capture_sources () = 0;
virtual void set_capture_offset () = 0;
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 5e8ced7d42..8f68f63d05 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -109,7 +109,8 @@ class Track : public Route, public PublicDiskstream
/* PublicDiskstream interface */
boost::shared_ptr<Playlist> playlist ();
- void monitor_input (bool);
+ void request_jack_monitors_input (bool);
+ void ensure_jack_monitors_input (bool);
bool destructive () const;
std::list<boost::shared_ptr<Source> > & last_capture_sources ();
void set_capture_offset ();