diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-10-31 21:16:44 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-10-31 21:16:44 +0000 |
| commit | 4978c0d4c63bba054181cc0988fd83bc5fa8c9eb (patch) | |
| tree | 1e7d61452e192e41d475f2f3adf4374026c5140f /libs/ardour/ardour | |
| parent | c0b59854ff2feb3e727c8014e7f30cbc00b22497 (diff) | |
A few comments and minor coding style adjustments.
git-svn-id: svn://localhost/ardour2/branches/3.0@10358 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/audio_diskstream.h | 7 | ||||
| -rw-r--r-- | libs/ardour/ardour/diskstream.h | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h index 519cbd264c..982d08e028 100644 --- a/libs/ardour/ardour/audio_diskstream.h +++ b/libs/ardour/ardour/audio_diskstream.h @@ -162,6 +162,7 @@ class AudioDiskstream : public Diskstream void ensure_monitor_input (bool) const; }; + /** Information about one of our channels */ struct ChannelInfo : public boost::noncopyable { ChannelInfo (framecnt_t playback_buffer_size, @@ -176,13 +177,15 @@ class AudioDiskstream : public Diskstream boost::shared_ptr<AudioFileSource> write_source; - /// information the Port that our audio data comes from - + /** Information about the Port that our audio data comes from */ ChannelSource source; Sample *current_capture_buffer; Sample *current_playback_buffer; + /** A ringbuffer for data to be played back, written to in the + butler thread, read from in the process thread. + */ PBD::RingBufferNPT<Sample> *playback_buf; PBD::RingBufferNPT<Sample> *capture_buf; diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h index 039474b5bd..bac998f677 100644 --- a/libs/ardour/ardour/diskstream.h +++ b/libs/ardour/ardour/diskstream.h @@ -283,8 +283,12 @@ class Diskstream : public SessionObject, public PublicDiskstream double _speed; double _target_speed; + /** The next frame position that we should be reading from in our playlist */ framepos_t file_frame; framepos_t playback_sample; + /** The number of frames that have been played back this time around the process/commit + * cycle, accounting for varispeed. + */ framecnt_t playback_distance; bool in_set_state; |