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

fix tabs in file, patch by Steve the Fiddle

Browse Source
This commit is contained in:
RichardAsh1981@gmail.com 2013-10-29 21:34:59 +00:00
parent d56c78b8fa
commit 8b24718978
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/TrackPanel.cpp
View File

@ -7456,17 +7456,17 @@ void TrackPanel::OnMergeStereo(wxCommandEvent & WXUNUSED(event))
mPopupMenuTarget->SetChannel(Track::LeftChannel);
partner->SetChannel(Track::RightChannel);
// Set new track heights and minimized state
bool bBothMinimizedp=((mPopupMenuTarget->GetMinimized())&&(partner->GetMinimized()));
mPopupMenuTarget->SetMinimized(false);
partner->SetMinimized(false);
int AverageHeight=(mPopupMenuTarget->GetHeight() + partner->GetHeight())/ 2;
mPopupMenuTarget->SetHeight(AverageHeight);
partner->SetHeight(AverageHeight);
mPopupMenuTarget->SetMinimized(bBothMinimizedp);
partner->SetMinimized(bBothMinimizedp);
// Set new track heights and minimized state
bool bBothMinimizedp=((mPopupMenuTarget->GetMinimized())&&(partner->GetMinimized()));
mPopupMenuTarget->SetMinimized(false);
partner->SetMinimized(false);
int AverageHeight=(mPopupMenuTarget->GetHeight() + partner->GetHeight())/ 2;
mPopupMenuTarget->SetHeight(AverageHeight);
partner->SetHeight(AverageHeight);
mPopupMenuTarget->SetMinimized(bBothMinimizedp);
partner->SetMinimized(bBothMinimizedp);
//On Demand - join the queues together.
if(ODManager::IsInstanceCreated() && partner->GetKind() == Track::Wave && mPopupMenuTarget->GetKind() == Track::Wave )
if(!ODManager::Instance()->MakeWaveTrackDependent((WaveTrack*)partner,(WaveTrack*)mPopupMenuTarget))
@ -7477,7 +7477,7 @@ void TrackPanel::OnMergeStereo(wxCommandEvent & WXUNUSED(event))
//for example it returns false when there are two different types of ODTasks on each track's queue.
//we will need to display this to the user.
}
MakeParentPushState(wxString::Format(_("Made '%s' a stereo track"),
mPopupMenuTarget->GetName().
c_str()),