From f0db054a07ecc9d49fede8fcc9175a85c635369f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Tue, 27 Apr 2010 23:34:22 +0000
Subject: [PATCH] Don't report an error when the user cancels a time stretch
 operation.

git-svn-id: svn://localhost/ardour2/branches/3.0@7008 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/editor_drag.cc   | 2 +-
 gtk2_ardour/editor_timefx.cc | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index d9da60e0c8..a4f402ba2c 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -3100,7 +3100,7 @@ TimeFXDrag::finished (GdkEvent* /*event*/, bool movement_occurred)
 	RegionSelection rs;
 	rs.add (_primary);
 
-	if (!_editor->time_stretch (rs, percentage) == 0) {
+	if (_editor->time_stretch (rs, percentage) == -1) {
 		error << _("An error occurred while executing time stretch operation") << endmsg;
 	}
 }
diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc
index 6a1f0d021a..6f5e380fef 100644
--- a/gtk2_ardour/editor_timefx.cc
+++ b/gtk2_ardour/editor_timefx.cc
@@ -58,6 +58,7 @@ using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 
+/** @return -1 in case of error, 1 if operation was cancelled by the user, 0 if everything went ok */
 int
 Editor::time_stretch (RegionSelection& regions, float fraction)
 {
@@ -96,6 +97,7 @@ Editor::pitch_shift (RegionSelection& regions, float fraction)
 	return time_fx (regions, fraction, true);
 }
 
+/** @return -1 in case of error, 1 if operation was cancelled by the user, 0 if everything went ok */
 int
 Editor::time_fx (RegionSelection& regions, float val, bool pitching)
 {