Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv1813
Modified Files:
Tag: Audacity_UmixIt
Menus.cpp TrackPanel.cpp
Log Message:
menu changes for Thinklabs
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.151.2.26.2.10
retrieving revision 1.151.2.26.2.11
diff -u -d -r1.151.2.26.2.10 -r1.151.2.26.2.11
--- Menus.cpp 11 Jun 2007 22:08:52 -0000 1.151.2.26.2.10
+++ Menus.cpp 5 Aug 2007 23:25:01 -0000 1.151.2.26.2.11
@@ -628,7 +628,7 @@
//
// Thinklabs Menu
//
- c->BeginMenu(wxT("Thinklabs"));
+ c->BeginMenu(wxT("&Thinklabs"));
c->SetDefaultFlags(AudioIONotBusyFlag | TimeSelectedFlag |
WaveTracksSelectedFlag,
AudioIONotBusyFlag | TimeSelectedFlag |
WaveTracksSelectedFlag);
Index: TrackPanel.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
retrieving revision 1.212.2.15.2.14
retrieving revision 1.212.2.15.2.15
diff -u -d -r1.212.2.15.2.14 -r1.212.2.15.2.15
--- TrackPanel.cpp 11 Jun 2007 22:08:52 -0000 1.212.2.15.2.14
+++ TrackPanel.cpp 5 Aug 2007 23:25:01 -0000 1.212.2.15.2.15
@@ -909,14 +909,14 @@
mWaveTrackMenu->Append(OnWaveformAndSpectrumID, _("Waveform and Spectrum"));
mWaveTrackMenu->AppendSeparator();
- mWaveTrackMenu->Append(OnChannelMonoID, _("Mono"));
- #if (AUDACITY_BRANDING != BRAND_THINKLABS)
+ #if (AUDACITY_BRANDING == BRAND_THINKLABS)
+ mWaveTrackMenu->Append(OnSplitStereoID, _("Split Stereo to Mono"));
+ #else // (AUDACITY_BRANDING != BRAND_THINKLABS)
+ mWaveTrackMenu->Append(OnChannelMonoID, _("Mono"));
mWaveTrackMenu->Append(OnChannelLeftID, _("Left Channel"));
mWaveTrackMenu->Append(OnChannelRightID, _("Right Channel"));
mWaveTrackMenu->Append(OnMergeStereoID, _("Make Stereo Track"));
- #endif
- mWaveTrackMenu->Append(OnSplitStereoID, _("Split Stereo Track"));
- #if (AUDACITY_BRANDING != BRAND_THINKLABS)
+ mWaveTrackMenu->Append(OnSplitStereoID, _("Split Stereo Track"));
mWaveTrackMenu->AppendSeparator();
mWaveTrackMenu->Append(0, _("Set Sample Format"), mFormatMenu);
mWaveTrackMenu->AppendSeparator();
@@ -3058,12 +3058,10 @@
&& next->GetKind() == Track::Wave)
canMakeStereo = true;
- #if (AUDACITY_BRANDING != BRAND_THINKLABS)
- theMenu->Enable(OnMergeStereoID, canMakeStereo);
- #endif
theMenu->Enable(OnSplitStereoID, t->GetLinked());
- theMenu->Enable(OnChannelMonoID, !t->GetLinked());
#if (AUDACITY_BRANDING != BRAND_THINKLABS)
+ theMenu->Enable(OnMergeStereoID, canMakeStereo);
+ theMenu->Enable(OnChannelMonoID, !t->GetLinked());
theMenu->Enable(OnChannelLeftID, !t->GetLinked());
theMenu->Enable(OnChannelRightID, !t->GetLinked());
#endif
@@ -4399,11 +4397,26 @@
void TrackPanel::OnSplitStereo(wxCommandEvent &event)
{
wxASSERT(mPopupMenuTarget);
- mPopupMenuTarget->SetLinked(false);
- MakeParentPushState(wxString::Format(_("Split stereo track '%s'"),
- mPopupMenuTarget->GetName().
- c_str()),
- _("Split"));
+ #if (AUDACITY_BRANDING == BRAND_THINKLABS)
+ // Command for Thinklabs is "Split Stereo to Mono", so split, then make
each mono.
+ Track* linkedTrack = mTracks->GetLink(mPopupMenuTarget);
+ mPopupMenuTarget->SetLinked(false);
+ mPopupMenuTarget->SetChannel(Track::MonoChannel);
+ if (linkedTrack != NULL)
+ linkedTrack->SetChannel(Track::MonoChannel);
+ MakeParentPushState(wxString::Format(_("Split stereo track '%s' to mono
tracks"),
+ mPopupMenuTarget->GetName().
+ c_str()),
+ _("Split"));
+ mPopupMenuTarget = NULL; // as in TrackPanel::OnChannelChange
+
+ #else // (AUDACITY_BRANDING != BRAND_THINKLABS)
+ mPopupMenuTarget->SetLinked(false);
+ MakeParentPushState(wxString::Format(_("Split stereo track '%s'"),
+ mPopupMenuTarget->GetName().
+ c_str()),
+ _("Split"));
+ #endif
Refresh(false);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
