make resampled sources (during import) report their "natural position" (i.e. BWF timecode) using the samplerate of the session, not the original source, for correct positioning; minor frame{pos,cnt}_t cleanup

git-svn-id: svn://localhost/ardour2/branches/3.0@7785 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-09-16 16:11:26 +00:00
parent 084dda86a7
commit 8e00b86ebb
8 changed files with 37 additions and 32 deletions

View file

@ -827,20 +827,16 @@ Editor::add_sources (vector<string> paths, SourceList& sources, nframes64_t& pos
if (as->natural_position() != 0) {
pos = as->natural_position();
cerr << "\tgot " << pos << " from source TC info\n";
} else if (target_tracks == 1) {
/* hmm, no timestamp available, put it after the previous region
*/
if (n == 0) {
pos = get_preferred_edit_position ();
cerr << "\tno timestamp, first file, use edit pos = " << pos << endl;
} else {
pos += rlen;
cerr << "\tpacked-sequence-shuffle to " << pos << endl;
}
} else {
pos = get_preferred_edit_position ();
cerr << "\tmultitracks, using edit position = " << pos << endl;
}
}