Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv18974
Modified Files:
Tag: Audacity_UmixIt
AudacityApp.cpp LyricsWindow.cpp MixerBoard.cpp Project.cpp
Log Message:
Lots of Mac fixes
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.178.2.17.2.12
retrieving revision 1.178.2.17.2.13
diff -u -d -r1.178.2.17.2.12 -r1.178.2.17.2.13
--- Project.cpp 26 Feb 2007 23:06:51 -0000 1.178.2.17.2.12
+++ Project.cpp 27 Feb 2007 10:32:42 -0000 1.178.2.17.2.13
@@ -1767,7 +1767,9 @@
}
//BG: Process messages before we destroy the window
+ #ifndef __WXMAC__
wxSafeYield();
+ #endif
Destroy();
}
Index: LyricsWindow.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/LyricsWindow.cpp,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- LyricsWindow.cpp 26 Feb 2007 23:06:51 -0000 1.1.2.6
+++ LyricsWindow.cpp 27 Feb 2007 10:32:41 -0000 1.1.2.7
@@ -31,9 +31,11 @@
wxT("- %s"),
parent->GetName().c_str()).c_str())),
wxDefaultPosition, gSize,
- wxDEFAULT_FRAME_STYLE | ((parent == NULL) ?
- 0x0 :
- wxFRAME_FLOAT_ON_PARENT))
+ wxDEFAULT_FRAME_STYLE
+#ifndef __WXMAC__
+ | ((parent == NULL) ? 0x0 : wxFRAME_FLOAT_ON_PARENT)
+#endif
+ )
{
mProject = parent;
mLyricsPanel = new Lyrics(this, -1, wxPoint(0, 0), gSize);
Index: MixerBoard.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/MixerBoard.cpp,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- MixerBoard.cpp 26 Feb 2007 23:08:56 -0000 1.1.2.10
+++ MixerBoard.cpp 27 Feb 2007 10:32:41 -0000 1.1.2.11
@@ -135,15 +135,23 @@
ctrlPos.x = (size.GetWidth() / 10);
ctrlPos.y += MUTE_SOLO_HEIGHT + kQuadrupleInset;
ctrlSize = wxSize((size.GetWidth() * 4 / 5), PAN_HEIGHT);
+
+ // The width of the pan slider must be odd (don't ask)
+ if (!(ctrlSize.x & 1))
+ ctrlSize.x--;
+
/* i18n-hint: Title of the Pan slider, used to move the sound left or right
stereoscopically */
mSlider_Pan = new ASlider(this, ID_ASLIDER_PAN, _("Pan"), ctrlPos,
ctrlSize, PAN_SLIDER | NO_AQUA);
//pBoxSizer_MixerTrackCluster->Add(mSlider_Pan, 0, wxALIGN_CENTER | wxALL,
kDoubleInset);
+ // Instead of an even split, give this many extra pixels to the meter
+ const int kExtraMeter = 8;
+
// gain slider & level meter
ctrlPos.x = kDoubleInset;
ctrlPos.y += PAN_HEIGHT + kQuadrupleInset;
- ctrlSize = wxSize((nHalfWidth - kQuadrupleInset),
+ ctrlSize = wxSize((nHalfWidth - kQuadrupleInset - kExtraMeter),
(size.GetHeight() - ctrlPos.y - kQuadrupleInset));
// ASlider doesn't do vertical, so use wxSlider for now.
@@ -170,16 +178,22 @@
// too much color: mSlider_Gain->SetBackgroundColour(trackColor);
// too dark:
mSlider_Gain->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
+ #ifdef __WXMAC__
+ mSlider_Gain->SetBackgroundColour(wxColour(220, 220, 220));
+ #else
mSlider_Gain->SetBackgroundColour(wxColour(192, 192, 192));
+ #endif
+
+ ctrlPos.x = nHalfWidth - kExtraMeter;
+ ctrlSize.SetWidth(nHalfWidth - kInset + kExtraMeter);
- 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
+ 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
+ false); // aqua not ok
//wxBoxSizer* pBoxSizer_GainAndMeter = new wxBoxSizer(wxHORIZONTAL);
//pBoxSizer_GainAndMeter->Add(mSlider_Gain, 0, wxALIGN_CENTER | wxALL,
kInset);
@@ -372,6 +386,8 @@
wxRect bev(0, 0, clusterSize.GetWidth() - 1, clusterSize.GetHeight() - 1);
AColor::Bevel(dc, true, bev);
+ mSlider_Pan->Refresh(false);
+
dc.EndDrawing();
}
@@ -522,7 +538,11 @@
wxString::Format(wxT("- %s"),
parent->GetName().c_str()).c_str())),
wxDefaultPosition, kDefaultSize,
- wxDEFAULT_FRAME_STYLE | ((parent == NULL) ? 0x0 :
wxFRAME_FLOAT_ON_PARENT))
+ wxDEFAULT_FRAME_STYLE
+#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.
Index: AudacityApp.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudacityApp.cpp,v
retrieving revision 1.97.2.14
retrieving revision 1.97.2.14.2.1
diff -u -d -r1.97.2.14 -r1.97.2.14.2.1
--- AudacityApp.cpp 4 Feb 2005 21:31:48 -0000 1.97.2.14
+++ AudacityApp.cpp 27 Feb 2007 10:32:40 -0000 1.97.2.14.2.1
@@ -140,10 +140,10 @@
if (!gAudacityProjects[i]->Close()){
gIsQuitting = false;
return;
+ }
}
}
}
- }
if (gFreqWindow)
gFreqWindow->Destroy();
-------------------------------------------------------------------------
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
