ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

import_pt: Fix PT import to session with existing tracks 

Previously, the PT import would place regions on tracks
numbered from 0, therefore landing on unrelated tracks
when pre-existing tracks were present in the session.

This change skips all existing ardour tracks and imports
the PT regions onto the correctly named, appended tracks.

If any tracks exist with the same names as the ones in the import,
the new tracks get an incremented number at the end of them and
the imported regions are placed on the new track, as expected.
This commit is contained in:
Damien Zammit 2023-04-20 15:18:25 +10:00
parent 03b4635bea
commit d2a4e0ac9a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/ardour/import_pt.cc
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2019 Damien Zammit <damien@zamaudio.com>
* Copyright (C) 2018-2023 Damien Zammit <damien@zamaudio.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -287,6 +287,7 @@ Session::import_pt_rest (PTFFormat& ptf)
uint16_t i;
uint16_t nth = 0;
uint16_t ntr = 0;
uint16_t existing_ntracks = 0;
struct ptflookup utr;
vector<midipair> uniquetr;
@ -338,7 +339,10 @@ Session::import_pt_rest (PTFFormat& ptf)
goto no_audio_tracks;
}
/* Create all tracks */
/* Get current number of ardour tracks */
existing_ntracks = naudiotracks ();
/* Create all PT tracks */
ntr = (ptf.tracks ().at (ptf.tracks ().size () - 1)).index + 1;
nth = -1;
for (vector<PTFFormat::track_t>::const_iterator a = ptf.tracks ().begin (); a != ptf.tracks ().end (); ++a) {
@ -352,10 +356,10 @@ Session::import_pt_rest (PTFFormat& ptf)
}
}
/* Get all playlists of all tracks and Playlist::freeze() all tracks */
/* Get all playlists of all tracks just created and Playlist::freeze() them */
assert (ntr == nth + 1);
for (i = 0; i < ntr; ++i) {
existing_track = get_nth_audio_track (i);
existing_track = get_nth_audio_track (i + existing_ntracks);
std::shared_ptr<Playlist> playlist = existing_track->playlist();
PlaylistState before;
@ -378,7 +382,7 @@ Session::import_pt_rest (PTFFormat& ptf)
DEBUG_TRACE (DEBUG::FileUtils, string_compose ("\twav(%1) reg(%2) tr(%3)\n", a->reg.wave.filename.c_str (), a->reg.index, a->index));
/* Use track we created earlier */
existing_track = get_nth_audio_track (a->index);
existing_track = get_nth_audio_track (a->index + existing_ntracks);
assert (existing_track);
/* Put on existing track */