diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-12 22:23:01 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-12 22:23:01 +0000 |
| commit | b01bdb7e70f021da764e81a4b55722e746e4885d (patch) | |
| tree | 3f22af0fc8399bedd6843f7a9a4383295ac7b3cb /gtk2_ardour/editor_audio_import.cc | |
| parent | 99d002dbdf2563bcad880628e7876aebe191ba0c (diff) | |
merged with trunk revs 2605-2627
git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_audio_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index b609918f09..193e98b58a 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -143,7 +143,7 @@ Editor::external_audio_dialog () nframes64_t where; switch (pos) { - case ImportAtEditCursor: + case ImportAtEditPoint: where = get_preferred_edit_position (); break; case ImportAtTimestamp: @@ -157,10 +157,6 @@ Editor::external_audio_dialog () break; } - if (where < 0) { - return; - } - SrcQuality quality = sfbrowser->get_src_quality(); if (sfbrowser->copy_files_btn.get_active()) { @@ -594,7 +590,6 @@ Editor::add_sources (vector<Glib::ustring> paths, SourceList& sources, nframes64 if (sources[0]->natural_position() != 0) { pos = sources[0]->natural_position(); } else { - // XXX is this the best alternative ? pos = get_preferred_edit_position (); } } |