diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-07 17:05:46 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-07 17:05:46 +0000 |
| commit | 998771e57d4687c0937fe1c36b294d4f075b6d3c (patch) | |
| tree | c2b4443cf23dbe71c0c2e60eb3ea47377f2f97ea /gtk2_ardour/editor_audio_import.cc | |
| parent | 5cd58a2e8bbc7e3d2face30ad0bf8e307ab395fa (diff) | |
initial round of work to support new edit point option, and removal of edit cursor
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2605 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_audio_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 02faf1bb6c..693f0e4986 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -143,7 +143,7 @@ Editor::external_audio_dialog () switch (pos) { case ImportAtEditCursor: - where = edit_cursor->current_frame; + where = get_preferred_edit_position (); break; case ImportAtTimestamp: where = -1; @@ -156,6 +156,10 @@ Editor::external_audio_dialog () break; } + if (where < 0) { + return; + } + SrcQuality quality = sfbrowser->get_src_quality(); if (sfbrowser->copy_files_btn.get_active()) { @@ -591,7 +595,7 @@ Editor::add_sources (vector<Glib::ustring> paths, SourceList& sources, nframes64 pos = sources[0]->natural_position(); } else { // XXX is this the best alternative ? - pos = edit_cursor->current_frame; + pos = get_preferred_edit_position (); } } |