Remove unused read/write data count code.

git-svn-id: svn://localhost/ardour2/branches/3.0@10300 d708f5d6-7413-0410-9779-e7cbd77b26cf

9 files changed, 1 insertions, 33 deletions

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index b418a2c409..a13b817718 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -102,8 +102,7 @@ class AudioRegion : public Region
 		ReadOpsNone = 0x0,
 		ReadOpsOwnAutomation = 0x1,
 		ReadOpsOwnScaling = 0x2,
-		ReadOpsCount = 0x4,
-		ReadOpsFades = 0x8
+		ReadOpsFades = 0x4
 	};
 
 	virtual framecnt_t read (Sample*, framepos_t pos, framecnt_t cnt, int channel) const;
diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h
index c9eb3bfc45..1d811bbfa3 100644
--- a/libs/ardour/ardour/audiosource.h
+++ b/libs/ardour/ardour/audiosource.h
@@ -67,10 +67,6 @@ class AudioSource : virtual public Source,
 	void set_captured_for (std::string str) { _captured_for = str; }
 	std::string captured_for() const { return _captured_for; }
 
-	uint32_t read_data_count() const { return _read_data_count; }
-	uint32_t write_data_count() const { return _write_data_count; }
-	void dec_read_data_count (framecnt_t);
-
 	int read_peaks (PeakData *peaks, framecnt_t npeaks,
 			framepos_t start, framecnt_t cnt, double samples_per_visual_peak) const;
 
@@ -131,9 +127,6 @@ class AudioSource : virtual public Source,
 	std::string         peakpath;
 	std::string        _captured_for;
 
-	mutable uint32_t _read_data_count;  // modified in read()
-	mutable uint32_t _write_data_count; // modified in write()
-
 	int initialize_peakfile (bool newfile, std::string path);
 	int build_peaks_from_scratch ();
 	int compute_and_write_peaks (Sample* buf, framecnt_t first_frame, framecnt_t cnt,
diff --git a/libs/ardour/ardour/butler.h b/libs/ardour/ardour/butler.h
index 9740099360..120f5871f4 100644
--- a/libs/ardour/ardour/butler.h
+++ b/libs/ardour/ardour/butler.h
@@ -51,9 +51,6 @@ class Butler : public SessionHandleRef
 	bool transport_work_requested() const;
 	void drop_references ();
 
-	float read_data_rate() const; ///< in usec
-	float write_data_rate() const;
-
 	framecnt_t audio_diskstream_capture_buffer_size() const { return audio_dstream_capture_buffer_size; }
 	framecnt_t audio_diskstream_playback_buffer_size() const { return audio_dstream_playback_buffer_size; }
 	uint32_t midi_diskstream_buffer_size()  const { return midi_dstream_buffer_size; }
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 975c8d45da..039474b5bd 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -175,9 +175,6 @@ class Diskstream : public SessionObject, public PublicDiskstream
 	virtual void reset_write_sources (bool, bool force = false) = 0;
 	virtual void non_realtime_input_change () = 0;
 
-	uint32_t read_data_count() const { return _read_data_count; }
-	uint32_t write_data_count() const { return _write_data_count; }
-
   protected:
 	friend class Auditioner;
 	virtual int  seek (framepos_t which_sample, bool complete_refill = false) = 0;
@@ -290,9 +287,6 @@ class Diskstream : public SessionObject, public PublicDiskstream
 	framepos_t     playback_sample;
 	framecnt_t     playback_distance;
 
-	uint32_t     _read_data_count;
-	uint32_t     _write_data_count;
-
 	bool          in_set_state;
 
 	Glib::Mutex state_lock;
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index 735a38faa5..3564fff4fc 100644
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -95,9 +95,6 @@ class MidiSource : virtual public Source, public boost::enable_shared_from_this<
 	std::string captured_for() const               { return _captured_for; }
 	void        set_captured_for (std::string str) { _captured_for = str; }
 
-	uint32_t read_data_count()  const { return _read_data_count; }
-	uint32_t write_data_count() const { return _write_data_count; }
-
 	framepos_t last_write_end() const { return _last_write_end; }
 	void set_last_write_end (framepos_t pos) { _last_write_end = pos; }
 
@@ -155,8 +152,6 @@ class MidiSource : virtual public Source, public boost::enable_shared_from_this<
 					   framecnt_t cnt) = 0;
 
 	std::string      _captured_for;
-	mutable uint32_t _read_data_count;  ///< modified in read()
-	mutable uint32_t _write_data_count; ///< modified in write()
 
 	boost::shared_ptr<MidiModel> _model;
 	bool                         _writing;
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 934695633e..9e15b9cf5d 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -201,8 +201,6 @@ public:
 	void raise_region_to_top (boost::shared_ptr<Region>);
 	void lower_region_to_bottom (boost::shared_ptr<Region>);
 
-	uint32_t read_data_count() const { return _read_data_count; }
-
 	/* XXX: use of diskstream here is a little unfortunate */
 	const PBD::ID& get_orig_diskstream_id () const { return _orig_diskstream_id; }
 	void set_orig_diskstream_id (const PBD::ID& did) { _orig_diskstream_id = did; }
@@ -292,7 +290,6 @@ public:
 	bool             in_partition;
 	bool            _frozen;
 	uint32_t         subcnt;
-	uint32_t        _read_data_count;
 	PBD::ID         _orig_diskstream_id;
 	uint64_t         layer_op_counter;
 	framecnt_t       freeze_length;
diff --git a/libs/ardour/ardour/public_diskstream.h b/libs/ardour/ardour/public_diskstream.h
index 8dc720963a..3dadf2e8be 100755
--- a/libs/ardour/ardour/public_diskstream.h
+++ b/libs/ardour/ardour/public_diskstream.h
@@ -43,8 +43,6 @@ public:
 	virtual float capture_buffer_load () const = 0;
 	virtual int do_refill () = 0;
 	virtual int do_flush (RunContext, bool force = false) = 0;
-	virtual uint32_t read_data_count() const = 0;
-	virtual uint32_t write_data_count() const = 0;
 	virtual void set_pending_overwrite (bool) = 0;
 	virtual int seek (framepos_t, bool complete_refill = false) = 0;
 	virtual bool hidden () const = 0;
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index 4b3e4623af..a2cc3f4cf7 100644
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -221,8 +221,6 @@ class Region
 
 	int apply (Filter &, Progress* progress = 0);
 
-	virtual uint64_t read_data_count () const { return _read_data_count; }
-
 	boost::shared_ptr<ARDOUR::Playlist> playlist () const { return _playlist.lock(); }
 	virtual void set_playlist (boost::weak_ptr<ARDOUR::Playlist>);
 
@@ -385,7 +383,6 @@ class Region
 	Timecode::BBT_Time      _bbt_time;
 	AnalysisFeatureList     _transients;
 
-	mutable uint64_t        _read_data_count;  ///< modified in read()
 	uint64_t                _last_layer_op;  ///< timestamp
 	SourceList              _sources;
 	/** Used when timefx are applied, so we can always use the original source */
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 01b084641d..dd8a17f8ce 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -120,8 +120,6 @@ class Track : public Route, public PublicDiskstream
 	float capture_buffer_load () const;
 	int do_refill ();
 	int do_flush (RunContext, bool force = false);
-	uint32_t read_data_count() const;
-	uint32_t write_data_count() const;
 	void set_pending_overwrite (bool);
 	int seek (framepos_t, bool complete_refill = false);
 	bool hidden () const;