Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-01 08:29:27 +02:00
Code Issues Releases Wiki Activity

Bug 2584 - "GetInfo: Envelopes" returns incorrect track numbers

Browse Source 
Also clip count resets to zero on each new track.
Also fixed GetInfo: Clips to count all tracks, not just wave tracks.
This commit is contained in:
James Crook 2020-11-15 20:14:12 +00:00
parent 69e0d7d114
commit d6a6b256fe
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/commands/GetInfoCommand.cpp
View File

@ -510,7 +510,8 @@ bool GetInfoCommand::SendClips(const CommandContext &context)
auto &tracks = TrackList::Get( context.project );
int i=0;
context.StartArray();
for (auto waveTrack : tracks.Leaders<WaveTrack>()) {
for (auto t : tracks.Leaders()) {
t->TypeSwitch([&](WaveTrack *waveTrack) {
WaveClipPointers ptrs(waveTrack->SortedClipArray());
for (WaveClip * pClip : ptrs) {
context.StartStruct();
@ -520,6 +521,8 @@ bool GetInfoCommand::SendClips(const CommandContext &context)
context.AddItem(pClip->GetColourIndex(), "color");
context.EndStruct();
}
});
// Per track numbering counts all tracks
i++;
}
context.EndArray();
@ -533,8 +536,10 @@ bool GetInfoCommand::SendEnvelopes(const CommandContext &context)
int i=0;
int j=0;
context.StartArray();
for (auto waveTrack : tracks.Leaders<WaveTrack>()) {
for (auto t : tracks.Leaders()) {
t->TypeSwitch([&](WaveTrack *waveTrack) {
WaveClipPointers ptrs(waveTrack->SortedClipArray());
j = 0;
for (WaveClip * pClip : ptrs) {
context.StartStruct();
context.AddItem((double)i, "track");
@ -557,6 +562,9 @@ bool GetInfoCommand::SendEnvelopes(const CommandContext &context)
context.EndStruct();
j++;
}
});
// Per track numbering counts all tracks
i++;
}
context.EndArray();
@ -601,8 +609,6 @@ bool GetInfoCommand::SendLabels(const CommandContext &context)
}
context.EndArray();
return true;
}