X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudio_diskstream.h;h=be43142f218b189bc2dcf97f6eb86d708ff55099;hb=184c7cedf9974ecce3445b2686a1ebb32703694c;hp=88718921781c7c533b9ccec5f675f16643f3b771;hpb=8536524bd36658db703b9cf147b735f5c3c3c8d1;p=ardour.git

diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index 8871892178..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) {
@@ -124,14 +124,6 @@ class AudioDiskstream : public Diskstream
 		}
 	}
 
-	static void swap_by_ptr (Sample *first, Sample *last, framecnt_t n) {
-		while (n--) {
-			Sample tmp = *first;
-			*first++ = *last;
-			*last-- = tmp;
-		}
-	}
-
 	CubicInterpolation interpolation;
 
   protected:
@@ -159,17 +151,18 @@ class AudioDiskstream : public Diskstream
   protected:
 	friend class AudioTrack;
 
-	int  process (framepos_t transport_frame, pframes_t nframes, bool& need_butler);
-	bool commit  (framecnt_t nframes);
+	int  process (framepos_t transport_frame, pframes_t nframes, framecnt_t &);
+	bool commit  (framecnt_t);
 
   private:
 	struct ChannelSource {
 		std::string name;
 
 		bool is_physical () const;
-		void ensure_monitor_input (bool) const;
+		void request_jack_monitors_input (bool) const;
 	};
 
+	/** Information about one of our channels */
 	struct ChannelInfo : public boost::noncopyable {
 
 		ChannelInfo (framecnt_t playback_buffer_size,
@@ -184,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;
 
@@ -211,8 +206,6 @@ class AudioDiskstream : public Diskstream
 
 	typedef std::vector<ChannelInfo*> ChannelList;
 
-	void process_varispeed_playback (pframes_t nframes, boost::shared_ptr<ChannelList> c);
-
 	/* The two central butler operations */
 	int do_flush (RunContext context, bool force = false);
 	int do_refill () { return _do_refill(_mixdown_buffer, _gain_buffer); }
@@ -221,7 +214,7 @@ class AudioDiskstream : public Diskstream
 
 	int read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
 	          framepos_t& start, framecnt_t cnt,
-	          ChannelInfo* channel_info, int channel, bool reversed);
+	          int channel, bool reversed);
 
 	void finish_capture (boost::shared_ptr<ChannelList>);
 	void transport_stopped_wallclock (struct tm&, time_t, bool abort);