allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Clarify ensure vs. request for JACK monitoring, naming-wise.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11064 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington
2011-12-23 01:11:46 +00:00
parent 15aa81fe70
commit d8a9f64bbc
10 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
libs/ardour/ardour/diskstream.h
View File

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

2
libs/ardour/ardour/midi_diskstream.h
View File

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

3
libs/ardour/ardour/public_diskstream.h
View File

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

3
libs/ardour/ardour/track.h
View File

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

2
libs/ardour/audio_diskstream.cc
View File

@@ -1973,7 +1973,7 @@ AudioDiskstream::allocate_temporary_buffers ()
}
void
AudioDiskstream::monitor_input (bool yn)
AudioDiskstream::request_jack_monitors_input (bool yn)
{
boost::shared_ptr<ChannelList> c = channels.reader();

2
libs/ardour/audio_track.cc
View File

@@ -100,7 +100,7 @@ AudioTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
}
_diskstream->set_record_enabled (false);
_diskstream->monitor_input (false);
_diskstream->request_jack_monitors_input (false);
DiskstreamChanged (); /* EMIT SIGNAL */
}

2
libs/ardour/midi_diskstream.cc
View File

@@ -1373,7 +1373,7 @@ MidiDiskstream::allocate_temporary_buffers ()
}
void
MidiDiskstream::monitor_input (bool yn)
MidiDiskstream::ensure_jack_monitors_input (bool yn)
{
boost::shared_ptr<MidiPort> sp = _source_port.lock ();

2
libs/ardour/session.cc
View File

@@ -782,7 +782,7 @@ Session::set_track_monitor_input_status (bool yn)
boost::shared_ptr<AudioTrack> tr = boost::dynamic_pointer_cast<AudioTrack> (*i);
if (tr && tr->record_enabled ()) {
//cerr << "switching to input = " << !auto_input << __FILE__ << __LINE__ << endl << endl;
tr->monitor_input (yn);
tr->request_jack_monitors_input (yn);
}
}
}

10
libs/ardour/track.cc
View File

@@ -484,9 +484,15 @@ Track::playlist ()
}
void
Track::monitor_input (bool m)
Track::request_jack_monitors_input (bool m)
{
_diskstream->monitor_input (m);
_diskstream->request_jack_monitors_input (m);
}
void
Track::ensure_jack_monitors_input (bool m)
{
_diskstream->ensure_jack_monitors_input (m);
}
bool