X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudio_diskstream.h;h=ab7c27c4f3697d47e689ebbe5f8ce8964d13777b;hb=cd2047cbffc5e0270acab555364bb9d958fe7927;hp=f05b69090190f0203718bd7d19526b6926aea8b7;hpb=d901dbccc912314b54494fab068785c188884fe4;p=ardour.git

diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index f05b690901..ab7c27c4f3 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -77,18 +77,6 @@ class AudioDiskstream : public Diskstream
 	int set_non_layered (bool yn);
 	bool can_become_destructive (bool& requires_bounce) const;
 
-	float peak_power(uint32_t n = 0) {
-		boost::shared_ptr<ChannelList> c = channels.reader();
-		ChannelInfo* chaninfo = (*c)[n];
-		float x = chaninfo->peak_power;
-		chaninfo->peak_power = 0.0f;
-		if (x > 0.0f) {
-			return 20.0f * fast_log10(x);
-		} else {
-			return minus_infinity();
-		}
-	}
-
 	boost::shared_ptr<AudioPlaylist> audio_playlist () { return boost::dynamic_pointer_cast<AudioPlaylist>(_playlist); }
 
 	int use_playlist (boost::shared_ptr<Playlist>);
@@ -136,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,7 +139,7 @@ class AudioDiskstream : public Diskstream
 	void set_block_size (pframes_t);
 	int  internal_playback_seek (framecnt_t distance);
 	int  can_internal_playback_seek (framecnt_t distance);
-        std::list<boost::shared_ptr<Source> > steal_write_sources();
+	std::list<boost::shared_ptr<Source> > steal_write_sources();
 	void reset_write_sources (bool, bool force = false);
 	void non_realtime_input_change ();
 	void non_realtime_locate (framepos_t location);
@@ -171,41 +151,41 @@ class AudioDiskstream : public Diskstream
   protected:
 	friend class AudioTrack;
 
-	int  process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool rec_monitors_input, 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;
+	struct ChannelSource {
+		std::string name;
 
-            bool is_physical () const;
-            void ensure_monitor_input (bool) const;
-        };
+		bool is_physical () const;
+		void ensure_monitor_input (bool) const;
+	};
 
+	/** Information about one of our channels */
 	struct ChannelInfo : public boost::noncopyable {
 
-		ChannelInfo (framecnt_t playback_buffer_size, 
-                             framecnt_t capture_buffer_size,
-                             framecnt_t speed_buffer_size, 
-                             framecnt_t wrap_buffer_size);
+		ChannelInfo (framecnt_t playback_buffer_size,
+		             framecnt_t capture_buffer_size,
+		             framecnt_t speed_buffer_size,
+		             framecnt_t wrap_buffer_size);
 		~ChannelInfo ();
 
 		Sample     *playback_wrap_buffer;
 		Sample     *capture_wrap_buffer;
 		Sample     *speed_buffer;
 
-		float       peak_power;
-
-		boost::shared_ptr<AudioFileSource> fades_source;
 		boost::shared_ptr<AudioFileSource> write_source;
 
-		/// information the Port that our audio data comes from
-		
-                ChannelSource source;
+		/** 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;
 
@@ -220,14 +200,12 @@ class AudioDiskstream : public Diskstream
 		// the following are used in the butler thread only
 		framecnt_t                     curr_capture_cnt;
 
-                void resize_playback (framecnt_t);
-                void resize_capture (framecnt_t);
+		void resize_playback (framecnt_t);
+		void resize_capture (framecnt_t);
 	};
 
 	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); }
@@ -235,10 +213,10 @@ class AudioDiskstream : public Diskstream
 	int do_refill_with_alloc ();
 
 	int read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
-                  framepos_t& start, framecnt_t cnt,
-                  ChannelInfo* channel_info, int channel, bool reversed);
+	          framepos_t& start, framecnt_t cnt,
+	          int channel, bool reversed);
 
-	void finish_capture (bool rec_monitors_input, boost::shared_ptr<ChannelList>);
+	void finish_capture (boost::shared_ptr<ChannelList>);
 	void transport_stopped_wallclock (struct tm&, time_t, bool abort);
 	void transport_looped (framepos_t transport_frame);
 
@@ -261,8 +239,8 @@ class AudioDiskstream : public Diskstream
 	void setup_destructive_playlist ();
 	void use_destructive_playlist ();
 
-        void adjust_playback_buffering ();
-        void adjust_capture_buffering ();
+	void adjust_playback_buffering ();
+	void adjust_capture_buffering ();
 
 	void engage_record_enable ();
 	void disengage_record_enable ();