diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-19 10:42:09 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-19 10:42:09 +0000 |
| commit | 21ea541267361b03c66a9cc330b7c862d7bc8e85 (patch) | |
| tree | 24c23aca13597cfadea84b98c9f8a857f4894282 /gtk2_ardour/editor_audio_import.cc | |
| parent | 959907af01dd398fd45ee28413d37f5516ce6047 (diff) | |
shift-click to extend marker selection; marker drag moves all selected markers
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3758 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_audio_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 3d75de782c..2daec610bd 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -330,24 +330,27 @@ Editor::_do_import (vector<ustring> paths, ImportDisposition chns, ImportMode mo } } else { - bool replace; + bool replace = false; for (vector<ustring>::iterator a = paths.begin(); a != paths.end() && ok; ++a) { - int check = check_whether_and_how_to_import(*a, true); + int check = check_whether_and_how_to_import (*a, true); - if (check == 2 ) { + switch (check) { + case 2: // skip continue; - } - - if (check == 0) { - fatal << "Updating existing sources should be disabled!" << endl; - replace = true; - } else if (check == 1) { + case 0: + fatal << "Updating existing sources should be disabled!" << endmsg; + /* NOTREACHED*/ + break; + case 1: replace = false; + break; + default: + fatal << "Illegal return " << check << " from check_whether_and_how_to_import()!" << endmsg; + /* NOTREACHED*/ } - switch (chns) { case Editing::ImportDistinctFiles: |