From 3f647a9dcd6129fdbbb78a10859516bb275648af Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Wed, 11 Apr 2012 15:47:33 +0000
Subject: [PATCH] Simplify slightly odd update_length() signature.

git-svn-id: svn://localhost/ardour2/branches/3.0@11900 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/ardour/audiosource.h | 2 +-
 libs/ardour/ardour/midi_source.h | 2 +-
 libs/ardour/ardour/source.h      | 2 +-
 libs/ardour/audiosource.cc       | 6 +++---
 libs/ardour/import.cc            | 2 +-
 libs/ardour/midi_source.cc       | 2 +-
 libs/ardour/sndfilesource.cc     | 6 ++----
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h
index 1d811bbfa3..c6ec2a56ad 100644
--- a/libs/ardour/ardour/audiosource.h
+++ b/libs/ardour/ardour/audiosource.h
@@ -51,7 +51,7 @@ class AudioSource : virtual public Source,
 
 	virtual bool       empty() const;
 	framecnt_t length (framepos_t pos) const;
-	void       update_length (framepos_t pos, framecnt_t cnt);
+	void       update_length (framecnt_t cnt);
 
 	virtual framecnt_t available_peaks (double zoom) const;
 
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index 3564fff4fc..ee5e40eb45 100644
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -76,7 +76,7 @@ class MidiSource : virtual public Source, public boost::enable_shared_from_this<
 
 	virtual bool       empty () const;
 	virtual framecnt_t length (framepos_t pos) const;
-	virtual void       update_length (framepos_t pos, framecnt_t cnt);
+	virtual void       update_length (framecnt_t);
 
 	virtual void mark_streaming_midi_write_started (NoteMode mode);
 	virtual void mark_streaming_write_started ();
diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index 1dde32d7ef..e65b4cb093 100644
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -62,7 +62,7 @@ class Source : public SessionObject
 
 	virtual bool       empty () const = 0;
 	virtual framecnt_t length (framepos_t pos) const = 0;
-	virtual void       update_length (framepos_t pos, framecnt_t cnt) = 0;
+	virtual void       update_length (framecnt_t cnt) = 0;
 
 	virtual framepos_t natural_position() const { return 0; }
 
diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc
index 08f9c553ce..8fe3b8d8c3 100644
--- a/libs/ardour/audiosource.cc
+++ b/libs/ardour/audiosource.cc
@@ -139,10 +139,10 @@ AudioSource::length (framepos_t /*pos*/) const
 }
 
 void
-AudioSource::update_length (framepos_t pos, framecnt_t cnt)
+AudioSource::update_length (framecnt_t len)
 {
-	if (pos + cnt > _length) {
-		_length = pos + cnt;
+	if (len > _length) {
+		_length = len;
 	}
 }
 
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index dd1eefe4ef..67ed6da941 100644
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -436,7 +436,7 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status,
 				const framepos_t pos = 0;
 				const double length_beats = ceil(t / (double)source->ppqn());
 				BeatsFramesConverter converter(smfs->session().tempo_map(), pos);
-				smfs->update_length(pos, converter.to(length_beats));
+				smfs->update_length(pos + converter.to(length_beats));
 				smfs->mark_streaming_write_completed ();
 
 				if (status.cancel) {
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index ad07269b6c..0ca8183655 100644
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -176,7 +176,7 @@ MidiSource::length (framepos_t pos) const
 }
 
 void
-MidiSource::update_length (framepos_t /*pos*/, framecnt_t /*cnt*/)
+MidiSource::update_length (framecnt_t)
 {
 	// You're not the boss of me!
 }
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index 1732a6f1a6..1f499bc61e 100644
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -393,15 +393,13 @@ SndFileSource::nondestructive_write_unlocked (Sample *data, framecnt_t cnt)
 		return 0;
 	}
 
-	framecnt_t oldlen;
 	int32_t frame_pos = _length;
 
 	if (write_float (data, frame_pos, cnt) != cnt) {
 		return 0;
 	}
 
-	oldlen = _length;
-	update_length (oldlen, cnt);
+	update_length (_length + cnt);
 
 	if (_build_peakfiles) {
 		compute_and_write_peaks (data, frame_pos, cnt, false, true);
@@ -488,7 +486,7 @@ SndFileSource::destructive_write_unlocked (Sample* data, framecnt_t cnt)
 		}
 	}
 
-	update_length (file_pos, cnt);
+	update_length (file_pos + cnt);
 
 	if (_build_peakfiles) {
 		compute_and_write_peaks (data, file_pos, cnt, false, true);