Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv27927
Modified Files:
Tag: Audacity_UmixIt
MixerBoard.cpp
Log Message:
display updates
Index: MixerBoard.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/MixerBoard.cpp,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- MixerBoard.cpp 20 Feb 2007 07:20:26 -0000 1.1.2.4
+++ MixerBoard.cpp 21 Feb 2007 03:26:11 -0000 1.1.2.5
@@ -13,7 +13,7 @@
#include <wx/dcmemory.h>
#include <wx/arrimpl.cpp>
#include <wx/settings.h> // for wxSystemSettings::GetSystemColour and
wxSystemSettings::GetMetric
-#include <wx/sizer.h>
+// #include <wx/sizer.h> //vvv Just get rid of sizers?
#include "AColor.h"
#include "Branding.h"
@@ -72,7 +72,7 @@
// Not sure why, but sizers aren't getting offset vertically,
// probably because not using wxDefaultPosition,
- // so positions are calculated explicitly below, but sizers are commented
out.
+ // so positions are calculated explicitly below, and sizers are commented
out.
// wxBoxSizer* pBoxSizer_MixerTrackCluster = new wxBoxSizer(wxVERTICAL);
wxColour trackColor = this->GetTrackColor();
@@ -140,7 +140,7 @@
// gain slider & level meter
ctrlPos.x = kDoubleInset;
ctrlPos.y += PAN_HEIGHT + kQuadrupleInset;
- ctrlSize = wxSize((size.GetWidth() / 3),
+ ctrlSize = wxSize((nHalfWidth - kQuadrupleInset),
(size.GetHeight() - ctrlPos.y - kQuadrupleInset));
mSlider_Gain =
// ASlider doesn't do vertical.
@@ -151,15 +151,19 @@
kGainSliderMin, kGainSliderMax, // int minValue, int
maxValue,
ctrlPos, ctrlSize, // const wxPoint& point =
wxDefaultPosition, const wxSize& size = wxDefaultSize,
wxSL_VERTICAL | wxSL_AUTOTICKS | wxSUNKEN_BORDER); //
long style = wxSL_HORIZONTAL, ...
+
// too much color: mSlider_Gain->SetBackgroundColour(trackColor);
// too dark:
mSlider_Gain->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
mSlider_Gain->SetBackgroundColour(wxColour(192, 192, 192));
- ctrlPos.x += ctrlSize.GetWidth() + kInset;
- ctrlSize = wxSize((nHalfWidth - kInset), ctrlSize.GetHeight());
- mMeter = new Meter(this, -1, false, Meter::MixerTrackCluster, ctrlPos,
ctrlSize, trackColor);
- mMeter->HandleLayout();
- //this->ResetMeter();
+ ctrlPos.x = nHalfWidth;
+ ctrlSize.SetWidth(nHalfWidth - kInset);
+ mMeter =
+ new Meter(this, -1, // wxWindow* parent, wxWindowID id,
+ false, Meter::MixerTrackCluster, // bool isInput, Style
style = HorizontalStereo,
+ ctrlPos, ctrlSize, // const wxPoint& pos =
wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ trackColor, // const wxColour& rmsColor = wxNullColour, //
Darker shades are automatically determined.
+ 300.0f); // const float decayRate = 60.0f); // dB/sec
//wxBoxSizer* pBoxSizer_GainAndMeter = new wxBoxSizer(wxHORIZONTAL);
//pBoxSizer_GainAndMeter->Add(mSlider_Gain, 0, wxALIGN_CENTER | wxALL,
kInset);
@@ -178,6 +182,12 @@
mMeter->SetToolTip(_T("Level Meter"));
#endif // wxUSE_TOOLTIPS
+
+ //vvv Necessary? Taken from Lyrics constructor.
+ #ifdef __WXMAC__
+ wxSizeEvent dummyEvent;
+ this->OnSize(dummyEvent);
+ #endif
}
void MixerTrackCluster::ResetMeter()
@@ -204,7 +214,13 @@
PAN_HEIGHT + kQuadrupleInset) - // pan slider
kQuadrupleInset; // margin below gain slider and meter
- mSlider_Gain->SetSize(-1, newHeight);
+ // -1 doesn't work right to preserve width for wxSlider, and it doesn't
implement GetSize(void).
+ // mSlider_Gain->SetSize(-1, newHeight);
+ int oldWidth;
+ int oldHeight;
+ mSlider_Gain->GetSize(&oldWidth, &oldHeight);
+ mSlider_Gain->SetSize(oldWidth, newHeight);
+
mMeter->SetSize(-1, newHeight);
}
@@ -325,6 +341,12 @@
dc.BeginDrawing();
+ #ifdef __WXMAC__
+ // Fill with correct color, not scroller background. Done automatically
on Windows.
+ AColor::Medium(&dc, false);
+ dc.DrawRectangle(this->GetRect());
+ #endif
+
wxSize clusterSize = this->GetSize();
wxRect bev(0, 0, clusterSize.GetWidth() - 1, clusterSize.GetHeight() - 1);
AColor::Bevel(dc, true, bev);
@@ -971,19 +993,25 @@
pMusicalInstrument = new MusicalInstrument(bitmap, wxT("loop"));
mMusicalInstruments.Add(pMusicalInstrument);
+ bitmap = new wxBitmap((const char**)organ_org_xpm);
+ dc.SelectObject(*bitmap);
+ AColor::Bevel(dc, false, bev);
+ pMusicalInstrument = new MusicalInstrument(bitmap, wxT("organ_org"));
+ mMusicalInstruments.Add(pMusicalInstrument);
+
bitmap = new wxBitmap((const char**)perc_xpm);
dc.SelectObject(*bitmap);
AColor::Bevel(dc, false, bev);
pMusicalInstrument = new MusicalInstrument(bitmap, wxT("perc"));
mMusicalInstruments.Add(pMusicalInstrument);
+
bitmap = new wxBitmap((const char**)sax_xpm);
dc.SelectObject(*bitmap);
AColor::Bevel(dc, false, bev);
pMusicalInstrument = new MusicalInstrument(bitmap, wxT("sax"));
mMusicalInstruments.Add(pMusicalInstrument);
-
bitmap = new wxBitmap((const char**)snare_xpm);
dc.SelectObject(*bitmap);
AColor::Bevel(dc, false, bev);
@@ -1002,13 +1030,13 @@
pMusicalInstrument = new MusicalInstrument(bitmap, wxT("synth"));
mMusicalInstruments.Add(pMusicalInstrument);
+
bitmap = new wxBitmap((const char**)tambo_xpm);
dc.SelectObject(*bitmap);
AColor::Bevel(dc, false, bev);
pMusicalInstrument = new MusicalInstrument(bitmap, wxT("tambo"));
mMusicalInstruments.Add(pMusicalInstrument);
-
bitmap = new wxBitmap((const char**)trumpet_horn_xpm);
dc.SelectObject(*bitmap);
AColor::Bevel(dc, false, bev);
@@ -1027,6 +1055,7 @@
pMusicalInstrument = new MusicalInstrument(bitmap, wxT("vibraphone_vibes"));
mMusicalInstruments.Add(pMusicalInstrument);
+
bitmap = new wxBitmap((const char**)vocal_vox_xpm);
dc.SelectObject(*bitmap);
AColor::Bevel(dc, false, bev);
@@ -1034,7 +1063,7 @@
mMusicalInstruments.Add(pMusicalInstrument);
- // This one should always be last, so it wins when best score is 0.
+ // This one must be last, so it wins when best score is 0.
bitmap = new wxBitmap((const char**)_default_instrument_xpm);
dc.SelectObject(*bitmap);
AColor::Bevel(dc, false, bev);
-------------------------------------------------------------------------
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
