[Audacity-cvs] audacity-src/src MixerBoard.cpp, 1.23, 1.24 MixerBoard.h, 1.14, 1.15

[Vaughan Johnson]

Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28031

Modified Files:
        MixerBoard.cpp MixerBoard.h 
Log Message:
Just get rid of the Pre Fade Meter checkbox. 
If there's demand, it will probably be for affecting all MixerBoard meters.

Index: MixerBoard.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- MixerBoard.cpp      15 Sep 2009 03:23:18 -0000      1.23
+++ MixerBoard.cpp      24 Sep 2009 00:59:04 -0000      1.24
@@ -90,7 +90,6 @@
    ID_SLIDER_GAIN,
    ID_TOGGLEBUTTON_MUTE, 
    ID_TOGGLEBUTTON_SOLO,
-   ID_CHECKBOX_PREFADE, 
 };
 
 BEGIN_EVENT_TABLE(MixerTrackCluster, wxPanel)
@@ -104,7 +103,6 @@
    //v EVT_COMMAND_SCROLL(ID_SLIDER_GAIN, 
MixerTrackCluster::OnSliderScroll_Gain)
    EVT_COMMAND(ID_TOGGLEBUTTON_MUTE, wxEVT_COMMAND_BUTTON_CLICKED, 
MixerTrackCluster::OnButton_Mute)
    EVT_COMMAND(ID_TOGGLEBUTTON_SOLO, wxEVT_COMMAND_BUTTON_CLICKED, 
MixerTrackCluster::OnButton_Solo)
-   EVT_CHECKBOX(ID_CHECKBOX_PREFADE, MixerTrackCluster::OnCheckBox_PreFade) 
 END_EVENT_TABLE()
 
 MixerTrackCluster::MixerTrackCluster(wxWindow* parent, 
@@ -213,19 +211,11 @@
    
    // meter
    ctrlPos.y += (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset;
-   mCheckBox_PreFade = 
-      new wxCheckBox(this, ID_CHECKBOX_PREFADE, 
-                     _("Pre"), ctrlPos, wxDefaultSize);
-   mCheckBox_PreFade->SetValue(false);
-
-   ctrlSize = mCheckBox_PreFade->GetSize();
-   ctrlPos.y += ctrlSize.GetHeight();
    const int nMeterHeight = 
       nGainSliderHeight - 
       (MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH + kDoubleInset) -
       (PAN_HEIGHT + kDoubleInset) - 
-      (MUTE_SOLO_HEIGHT + (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset) - 
-      ctrlSize.GetHeight();
+      (MUTE_SOLO_HEIGHT + (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset);
    ctrlSize.Set(kRightSideStackWidth, nMeterHeight);
    mMeter = 
       new Meter(this, -1, // wxWindow* parent, wxWindowID id, 
@@ -237,7 +227,6 @@
       mStaticText_TrackName->SetToolTip(mLeftTrack->GetName());
       mToggleButton_Mute->SetToolTip(_("Mute"));
       mToggleButton_Solo->SetToolTip(_("Solo"));
-      mCheckBox_PreFade->SetToolTip(_("Show meter pre/post fade."));
       mMeter->SetToolTip(_("Signal Level Meter"));
    #endif // wxUSE_TOOLTIPS
 
@@ -271,12 +260,10 @@
 
    mToggleButton_Solo->Show(!bSoloNone);
 
-   wxSize ctrlSize = mCheckBox_PreFade->GetSize();
    const int nRequiredHeightAboveMeter = 
       MUSICAL_INSTRUMENT_HEIGHT_AND_WIDTH + kDoubleInset + 
       PAN_HEIGHT + kDoubleInset + 
-      MUTE_SOLO_HEIGHT + (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset + 
-      ctrlSize.GetHeight();
+      MUTE_SOLO_HEIGHT + (bSoloNone ? 0 : MUTE_SOLO_HEIGHT) + kDoubleInset;
    const int nMeterY = 
       kDoubleInset + // margin at top
       TRACK_NAME_HEIGHT + kDoubleInset + 
@@ -402,7 +389,7 @@
       else
       {
          // Mono: Start with raw values same as left. 
-         // To be modified by pre/post fade and channel pan/gain.
+         // To be modified by bWantPostFadeValues and channel pan/gain.
          maxRight[i] = maxLeft[i];
          rmsRight[i] = rmsLeft[i];
       }
@@ -411,8 +398,8 @@
       i++;
    }
 
-   // If we want post fade values, modify values by gain factor.
-   if (bSuccess && !mCheckBox_PreFade->GetValue())
+   bool bWantPostFadeValues = true; //v Turn this into a checkbox on 
MixerBoard?
+   if (bSuccess && bWantPostFadeValues)
    {
       for (i = 0; i < nFramesPerBuffer; i++)
       {
@@ -600,10 +587,6 @@
       mProject->RefreshTPTrack(mLeftTrack);
 }
 
-void MixerTrackCluster::OnCheckBox_PreFade(wxCommandEvent& event)
-{
-}
-
 
 // class MusicalInstrument
 

Index: MixerBoard.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- MixerBoard.h        15 Sep 2009 20:03:24 -0000      1.14
+++ MixerBoard.h        24 Sep 2009 00:59:04 -0000      1.15
@@ -22,7 +22,6 @@
 #include <wx/scrolwin.h>
 #include <wx/statbmp.h>
 #include <wx/stattext.h>
-#include <wx/checkbox.h>
 
 #include "widgets/AButton.h"
 #include "widgets/ASlider.h"
@@ -104,7 +103,6 @@
    void OnSlider_Pan(wxCommandEvent& event);
    void OnButton_Mute(wxCommandEvent& event);
    void OnButton_Solo(wxCommandEvent& event);
-   void OnCheckBox_PreFade(wxCommandEvent& event);
    //v void OnSliderScroll_Gain(wxScrollEvent& event);
 
 public:
@@ -122,8 +120,6 @@
    AButton* mToggleButton_Solo;
    MixerTrackSlider* mSlider_Pan;
    MixerTrackSlider* mSlider_Gain;
-
-   wxCheckBox* mCheckBox_PreFade;
    Meter* mMeter;
 
 public:


------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs