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

I think this fixes the remaining issues in bug 670.

Browse Source
This commit is contained in:
v.audacity 2013-10-18 05:03:50 +00:00
parent 945b27fea0
commit cdccd118d8
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/TrackPanel.cpp
View File

@ -5213,11 +5213,10 @@ bool TrackPanel::HandleTrackLocationMouseEvent(WaveTrack * track, wxRect &r, wxM
if (track->ExpandCutLine(mCapturedTrackLocation.pos, &cutlineStart, &cutlineEnd))
{
WaveTrack* linked = (WaveTrack*)mTracks->GetLink(track);
if (linked)
{
bool bResult = linked->ExpandCutLine(mCapturedTrackLocation.pos);
wxASSERT(bResult); // TO DO: Actually handle this.
}
if (linked &&
!linked->ExpandCutLine(mCapturedTrackLocation.pos))
return false;
mViewInfo->sel0 = cutlineStart;
mViewInfo->sel1 = cutlineEnd;
DisplaySelection();
@ -5226,14 +5225,14 @@ bool TrackPanel::HandleTrackLocationMouseEvent(WaveTrack * track, wxRect &r, wxM
}
} else if (mCapturedTrackLocation.typ == WaveTrack::locationMergePoint)
{
bool bResult = track->MergeClips(mCapturedTrackLocation.clipidx1, mCapturedTrackLocation.clipidx2);
wxASSERT(bResult); // TO DO: Actually handle this.
if (!track->MergeClips(mCapturedTrackLocation.clipidx1, mCapturedTrackLocation.clipidx2))
return false;
WaveTrack* linked = (WaveTrack*)mTracks->GetLink(track);
if (linked)
{
bResult = linked->MergeClips(mCapturedTrackLocation.clipidx1, mCapturedTrackLocation.clipidx2);
wxASSERT(bResult); // TO DO: Actually handle this.
}
if (linked &&
!linked->MergeClips(mCapturedTrackLocation.clipidx1, mCapturedTrackLocation.clipidx2))
return false;
MakeParentPushState(_("Merged Clips"),_("Merge"), PUSH_CONSOLIDATE|PUSH_CALC_SPACE);
handled = true;
}