allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Don't report an error when the user cancels a time stretch operation.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7008 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington
2010-04-27 23:34:22 +00:00
parent a54d090992
commit f0db054a07
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_drag.cc
View File

@@ -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;
}
}

2
gtk2_ardour/editor_timefx.cc
View File

@@ -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)
{