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

Remove use of GetLink(ed) in AudacityProject::OnPaste

Browse Source
This commit is contained in:
Paul Licameli 2017-01-11 20:49:38 -05:00
parent 7eadd7a36f
commit d2a18f01e3
1 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Menus.cpp
View File

@ -5710,6 +5710,7 @@ void MenuCommandHandler::OnPaste(const CommandContext &context)
bool bPastedSomething = false; bool bPastedSomething = false;
auto pC = clipTrackRange.begin(); auto pC = clipTrackRange.begin();
size_t nnChannels, ncChannels;
while (*pN && *pC) { while (*pN && *pC) {
auto n = *pN; auto n = *pN;
auto c = *pC; auto c = *pC;
@ -5764,15 +5765,34 @@ void MenuCommandHandler::OnPaste(const CommandContext &context)
_("Pasting one type of track into another is not allowed.") _("Pasting one type of track into another is not allowed.")
}; };
// We should need this check only each time we visit the leading
// channel
if ( n->IsLeader() ) {
wxASSERT( c->IsLeader() ); // the iteration logic should ensure this
auto cChannels = TrackList::Channels(c);
ncChannels = cChannels.size();
auto nChannels = TrackList::Channels(n);
nnChannels = nChannels.size();
// When trying to copy from stereo to mono track, show error and exit // When trying to copy from stereo to mono track, show error and exit
// TODO: Automatically offer user to mix down to mono (unfortunately // TODO: Automatically offer user to mix down to mono (unfortunately
// this is not easy to implement // this is not easy to implement
if (c->GetLinked() && !n->GetLinked()) if (ncChannels > nnChannels)
{
if (ncChannels > 2) {
// TODO: more-than-two-channels-message
// Re-word the error message
}
// else
// Throw, so that any previous changes to the project in this loop // Throw, so that any previous changes to the project in this loop
// are discarded. // are discarded.
throw SimpleMessageBoxException{ throw SimpleMessageBoxException{
_("Copying stereo audio into a mono track is not allowed.") _("Copying stereo audio into a mono track is not allowed.")
}; };
}
}
if (!ff) if (!ff)
ff = n; ff = n;
@ -5807,11 +5827,17 @@ void MenuCommandHandler::OnPaste(const CommandContext &context)
} }
); );
--nnChannels;
--ncChannels;
// When copying from mono to stereo track, paste the wave form // When copying from mono to stereo track, paste the wave form
// to both channels // to both channels
if (n->GetLinked() && !c->GetLinked()) // TODO: more-than-two-channels
// This will replicate the last pasted channel as many times as needed
while (nnChannels > 0 && ncChannels == 0)
{ {
n = * ++ pN; n = * ++ pN;
--nnChannels;
n->TypeSwitch( n->TypeSwitch(
[&](WaveTrack *wn){ [&](WaveTrack *wn){
@ -5827,7 +5853,7 @@ void MenuCommandHandler::OnPaste(const CommandContext &context)
); );
} }
if (bAdvanceClipboard){ if (bAdvanceClipboard) {
prevClip = c; prevClip = c;
c = * ++ pC; c = * ++ pC;
} }