Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv14560
Modified Files:
Tag: Audacity_UmixIt
ControlToolBar.cpp Menus.cpp MixerBoard.cpp
Log Message:
cleanup
Index: ControlToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/ControlToolBar.cpp,v
retrieving revision 1.61.2.14
retrieving revision 1.61.2.14.2.1
diff -u -d -r1.61.2.14 -r1.61.2.14.2.1
--- ControlToolBar.cpp 26 Oct 2006 18:33:07 -0000 1.61.2.14
+++ ControlToolBar.cpp 22 Mar 2007 02:18:56 -0000 1.61.2.14.2.1
@@ -516,7 +516,7 @@
ControlToolBar::~ControlToolBar()
{
- for (int i = 0; i < 5; i++)
+ for (int i = 0; i < numTools; i++)
delete mTool[i];
delete mRewind;
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.151.2.26.2.3
retrieving revision 1.151.2.26.2.4
diff -u -d -r1.151.2.26.2.3 -r1.151.2.26.2.4
--- Menus.cpp 2 Feb 2007 01:36:06 -0000 1.151.2.26.2.3
+++ Menus.cpp 22 Mar 2007 02:18:56 -0000 1.151.2.26.2.4
@@ -367,6 +367,7 @@
c->AddSeparator();
c->AddItem("Lyrics", _("&Lyrics..."), FN(OnLyrics));
c->AddItem("Mixer Board", _("&Mixer Board..."),
FN(OnMixerBoard));
+ c->AddItem("Track Panel", _("&Track Panel..."),
FN(OnTrackPanel));
c->AddSeparator();
c->AddItem("FloatControlTB", _("Float Control Toolbar"),
FN(OnFloatControlToolBar));
c->AddItem("FloatEditTB", _("Float Edit Toolbar"),
FN(OnFloatEditToolBar));
@@ -498,7 +499,7 @@
c->BeginMenu(_("&Analyze"));
/* plot spectrum moved from view */
- c->AddItem("PlotSpectrum", _("&Plot Spectrum"),
FN(OnPlotSpectrum));
+ c->AddItem("PlotSpectrum", _("&Plot Spectrum..."),
FN(OnPlotSpectrum));
c->SetCommandFlags("PlotSpectrum",
AudioIONotBusyFlag | WaveTracksSelectedFlag |
TimeSelectedFlag,
AudioIONotBusyFlag | WaveTracksSelectedFlag |
TimeSelectedFlag);
@@ -1673,10 +1674,10 @@
void AudacityProject::OnHistory()
{
if (mHistoryWindow)
- mHistoryWindow->Show(true);
+ mHistoryWindow->Show();
else {
mHistoryWindow = new HistoryWindow(this, &mUndoManager);
- mHistoryWindow->Show(true);
+ mHistoryWindow->Show();
}
}
@@ -2401,7 +2402,7 @@
InitFreqWindow(gParentWindow);
gFreqWindow->Plot(len, buffer, rate);
- gFreqWindow->Show(true);
+ gFreqWindow->Show();
gFreqWindow->Raise();
delete[] buffer;
@@ -2585,23 +2586,25 @@
void AudacityProject::OnLyrics()
{
if (mLyricsWindow)
- mLyricsWindow->Show(true);
+ mLyricsWindow->Show();
else {
mLyricsWindow = new LyricsWindow(this);
wxASSERT(mLyricsWindow);
- mLyricsWindow->Show(true);
+ mLyricsWindow->Show();
}
}
void AudacityProject::OnMixerBoard()
{
- if (mMixerBoard)
- mMixerBoard->Show(true);
- else {
+ if (!mMixerBoard)
mMixerBoard = new MixerBoard(this);
- wxASSERT(mMixerBoard);
- mMixerBoard->Show(true);
- }
+
+ mMixerBoard->Show();
+}
+
+void AudacityProject::OnTrackPanel()
+{
+ mTrackPanel->Show();
}
//
Index: MixerBoard.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/MixerBoard.cpp,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -d -r1.1.2.13 -r1.1.2.14
--- MixerBoard.cpp 1 Mar 2007 02:28:18 -0000 1.1.2.13
+++ MixerBoard.cpp 22 Mar 2007 02:18:56 -0000 1.1.2.14
@@ -32,7 +32,7 @@
#define kTripleInset (3 * kInset)
#define kQuadrupleInset (4 * kInset)
-#define TITLE_BAR_HEIGHT 18
+#define TRACK_NAME_HEIGHT 18
#define MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH 48
#define MUTE_SOLO_HEIGHT 16
#define PAN_HEIGHT 24
@@ -82,7 +82,7 @@
// track name
wxPoint ctrlPos(kInset, kInset);
- wxSize ctrlSize(size.GetWidth() - kDoubleInset, TITLE_BAR_HEIGHT);
+ wxSize ctrlSize(size.GetWidth() - kDoubleInset, TRACK_NAME_HEIGHT);
mStaticText_TrackName =
new wxStaticText(this, -1, mLeftTrack->GetName(), ctrlPos, ctrlSize,
wxALIGN_CENTRE | wxST_NO_AUTORESIZE | wxSUNKEN_BORDER);
@@ -92,7 +92,7 @@
// musical instrument image
ctrlPos.x = (size.GetWidth() - MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH) / 2; //
center
- ctrlPos.y += TITLE_BAR_HEIGHT + kDoubleInset;
+ ctrlPos.y += TRACK_NAME_HEIGHT + kDoubleInset;
ctrlSize = wxSize(MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH,
MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH);
wxBitmap* bitmap = mMixerBoard->GetMusicalInstrumentBitmap(mLeftTrack);
wxASSERT(bitmap);
@@ -239,7 +239,7 @@
int newHeight =
newClusterHeight -
(kInset + // margin above mStaticText_TrackName
- TITLE_BAR_HEIGHT + kDoubleInset + // mStaticText_TrackName + margin
+ TRACK_NAME_HEIGHT + kDoubleInset + // mStaticText_TrackName + margin
MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH + kQuadrupleInset + // musical
instrument icon + margin
MUTE_SOLO_HEIGHT + kQuadrupleInset + // mute/solo buttons + margin
PAN_HEIGHT + kQuadrupleInset) - // pan slider
@@ -356,13 +356,11 @@
wxColour MixerTrackCluster::GetTrackColor()
{
- //vvv This doesn't work right when switching back and forth between two
projects
- // when one is branded and the other is not, because OnActivate
- // isn't always called, so gActiveProject isn't updated.
- Branding* pBranding = mProject->GetBranding();
- if (pBranding && (pBranding->GetBrandColorScheme() == "UmixIt")) //vvv
UmixIt
+ #if (AUDACITY_BRANDING == BRAND_UMIXIT)
return AColor::GetTrackColor((void*)mLeftTrack);
- return wxColour(102, 255, 102); // same as Meter playback color
+ #else
+ return wxColour(102, 255, 102); // same as Meter playback color
+ #endif
}
// event handlers
@@ -529,19 +527,21 @@
EVT_SIZE(MixerBoard::OnSize)
END_EVENT_TABLE()
-MixerBoard::MixerBoard(AudacityProject* parent):
- wxFrame(parent, -1,
+MixerBoard::MixerBoard(AudacityProject* parent,
+ const wxPoint& pos /*= wxDefaultPosition*/,
+ const wxSize& size /*= wxDefaultSize*/) :
+ wxFrame(parent, -1,
wxString::Format(_("Audacity Mixer Board%s"),
((parent->GetName() == wxEmptyString) ?
wxT("") :
wxString::Format(wxT(" - %s"),
parent->GetName().c_str()).c_str())),
- wxDefaultPosition, kDefaultSize,
+ pos, size,
wxDEFAULT_FRAME_STYLE
-#ifndef __WXMAC__
- | ((parent == NULL) ? 0x0 : wxFRAME_FLOAT_ON_PARENT)
-#endif
- )
+ #ifndef __WXMAC__
+ | ((parent == NULL) ? 0x0 : wxFRAME_FLOAT_ON_PARENT)
+ #endif
+ )
{
// public data members
// mute & solo button images: Create once and store on MixerBoard for use
in all MixerTrackClusters.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
