smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 12:46:32 +01:00
Code Issues Projects Releases Wiki Activity

Fixed bug where embedded sources did not correctly obey the BWF time stamp and would import at the timestamp of the first file. Fixes #0004070

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9742 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Todd Naugle 2011-06-16 15:18:01 +00:00
parent 0bf826eb4e
commit cb8bc87a54
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gtk2_ardour/editor_audio_import.cc
View file

@ -447,11 +447,17 @@ Editor::do_embed (vector<string> paths, ImportDisposition chns, ImportMode mode,
vector<string> to_embed; vector<string> to_embed;
bool multi = paths.size() > 1; bool multi = paths.size() > 1;
int nth = 0; int nth = 0;
bool use_timestamp = (pos == -1);
switch (chns) { switch (chns) {
case Editing::ImportDistinctFiles: case Editing::ImportDistinctFiles:
for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) { for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) {
/* have to reset this for every file we handle */
if (use_timestamp) {
pos = -1;
}
to_embed.clear (); to_embed.clear ();
to_embed.push_back (*a); to_embed.push_back (*a);
@ -468,6 +474,11 @@ Editor::do_embed (vector<string> paths, ImportDisposition chns, ImportMode mode,
case Editing::ImportDistinctChannels: case Editing::ImportDistinctChannels:
for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) { for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) {
/* have to reset this for every file we handle */
if (use_timestamp) {
pos = -1;
}
to_embed.clear (); to_embed.clear ();
to_embed.push_back (*a); to_embed.push_back (*a);
@ -486,6 +497,11 @@ Editor::do_embed (vector<string> paths, ImportDisposition chns, ImportMode mode,
case Editing::ImportSerializeFiles: case Editing::ImportSerializeFiles:
for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) { for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) {
/* have to reset this for every file we handle */
if (use_timestamp) {
pos = -1;
}
to_embed.clear (); to_embed.clear ();
to_embed.push_back (*a); to_embed.push_back (*a);