Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-25 08:38:39 +02:00
Code Issues Releases Wiki Activity

Bug389: merging clips in one stereo channel should not affect the other...

Browse Source 
... unless there is also a merge line at the same time in the other.
This commit is contained in:
Paul Licameli 2016-01-23 18:17:35 -05:00
parent 3062488cec
commit c703631b8c
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/TrackPanel.cpp
View File

@ -6564,6 +6564,20 @@ void TrackPanel::OnMouseEvent(wxMouseEvent & event)
} }
} }
namespace {
int FindMergeLine(WaveTrack *track, double time)
{
const double tolerance = 0.5 / track->GetRate();
for (int ii = 0, nn = track->GetNumCachedLocations(); ii < nn; ++ii) {
WaveTrack::Location loc = track->GetCachedLocation(ii);
if (loc.typ == WaveTrackLocation::locationMergePoint &&
fabs(time - loc.pos) < tolerance)
return ii;
}
return -1;
}
}
bool TrackPanel::HandleTrackLocationMouseEvent(WaveTrack * track, wxRect &rect, wxMouseEvent &event) bool TrackPanel::HandleTrackLocationMouseEvent(WaveTrack * track, wxRect &rect, wxMouseEvent &event)
{ {
// FIXME: Disable this and return true when CutLines aren't showing? // FIXME: Disable this and return true when CutLines aren't showing?
@ -6610,13 +6624,20 @@ bool TrackPanel::HandleTrackLocationMouseEvent(WaveTrack * track, wxRect &rect,
} }
} }
else if (mCapturedTrackLocation.typ == WaveTrackLocation::locationMergePoint) { else if (mCapturedTrackLocation.typ == WaveTrackLocation::locationMergePoint) {
const double pos = mCapturedTrackLocation.pos;
if (!track->MergeClips(mCapturedTrackLocation.clipidx1, mCapturedTrackLocation.clipidx2)) if (!track->MergeClips(mCapturedTrackLocation.clipidx1, mCapturedTrackLocation.clipidx2))
return false; return false;
WaveTrack* linked = (WaveTrack*)mTracks->GetLink(track); WaveTrack* linked = (WaveTrack*)mTracks->GetLink(track);
if (linked && if (linked) {
!linked->MergeClips(mCapturedTrackLocation.clipidx1, mCapturedTrackLocation.clipidx2)) // Don't assume correspondence of merge points across channels!
int idx = FindMergeLine(linked, pos);
if (idx >= 0) {
WaveTrack::Location location = linked->GetCachedLocation(idx);
if (!linked->MergeClips(location.clipidx1, location.clipidx2))
return false; return false;
}
}
MakeParentPushState(_("Merged Clips"),_("Merge"), PUSH_CONSOLIDATE); MakeParentPushState(_("Merged Clips"),_("Merge"), PUSH_CONSOLIDATE);
handled = true; handled = true;