From a48cdf5ba639a6f25dc593d7c9bb4560df4e90b8 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Wed, 29 Dec 2010 01:33:49 +0000
Subject: [PATCH] Clear displayed transients on closing the rhythm ferret
 dialogue.  Fixes #3623.

git-svn-id: svn://localhost/ardour2/branches/3.0@8357 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/rhythm_ferret.cc | 20 +++++++++++++++++---
 gtk2_ardour/rhythm_ferret.h  |  5 +++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc
index da31feca3c..5685cb56af 100644
--- a/gtk2_ardour/rhythm_ferret.cc
+++ b/gtk2_ardour/rhythm_ferret.cc
@@ -183,15 +183,17 @@ RhythmFerret::run_analysis ()
 		return;
 	}
 
-	RegionSelection& regions (editor.get_selection().regions);
+	clear_transients ();
+
+	regions_with_transients = editor.get_selection().regions;
 
 	current_results.clear ();
 
-	if (regions.empty()) {
+	if (regions_with_transients.empty()) {
 		return;
 	}
 
-	for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) {
+	for (RegionSelection::iterator i = regions_with_transients.begin(); i != regions_with_transients.end(); ++i) {
 
 		boost::shared_ptr<Readable> rd = boost::static_pointer_cast<AudioRegion> ((*i)->region());
 
@@ -382,5 +384,17 @@ void
 RhythmFerret::on_hide ()
 {
 	ArdourDialog::on_hide ();
+	clear_transients ();
+}
+
+/* Clear any transients that we have added */
+void
+RhythmFerret::clear_transients ()
+{
+	current_results.clear ();
+	for (RegionSelection::iterator i = regions_with_transients.begin(); i != regions_with_transients.end(); ++i) {
+		(*i)->region()->set_transients (current_results);
+	}
+	regions_with_transients.clear ();
 }
 
diff --git a/gtk2_ardour/rhythm_ferret.h b/gtk2_ardour/rhythm_ferret.h
index 1d84645056..a1a201531b 100644
--- a/gtk2_ardour/rhythm_ferret.h
+++ b/gtk2_ardour/rhythm_ferret.h
@@ -12,6 +12,7 @@
 #include <gtkmm/button.h>
 
 #include "ardour_dialog.h"
+#include "region_selection.h"
 
 namespace ARDOUR {
 	class Readable;
@@ -79,6 +80,10 @@ class RhythmFerret : public ArdourDialog {
 
 	ARDOUR::AnalysisFeatureList current_results;
 
+	void clear_transients ();
+	/** Regions that we have added transient marks to */
+	RegionSelection regions_with_transients;
+
 	AnalysisMode get_analysis_mode () const;
 	Action get_action() const;
 	void analysis_mode_changed ();