From d45ac35dde205a0cc991dedfa7ed08807f24299a Mon Sep 17 00:00:00 2001
From: richardash1981 <richardash1981@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Sun, 21 Feb 2010 17:36:22 +0000
Subject: [PATCH] Make EQ curve inversion a non-experimental feature, and
 change the name of the "flat" button to "flatten" - that's what it does to
 the curve.

---
 src/Experimental.h           | 1 -
 src/effects/Equalization.cpp | 8 +-------
 src/effects/Equalization.h   | 4 ----
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/Experimental.h b/src/Experimental.h
index c8f81caf8..b45e4bbe2 100644
--- a/src/Experimental.h
+++ b/src/Experimental.h
@@ -148,7 +148,6 @@ extern void AddPages(   AudacityProject * pProj, GuiFactory & Factory,  wxNotebo
    //#define AUTOMATED_INPUT_LEVEL_ADJUSTMENT
 #endif
 
-//#define EXPERIMENTAL_EQ_INVERT // MJS, 30th Dec 2009.  Add a button to EQ to allow inverting of any curve.
 
 #endif
 
diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp
index c1b31cb34..d78230c7c 100644
--- a/src/effects/Equalization.cpp
+++ b/src/effects/Equalization.cpp
@@ -988,9 +988,7 @@ BEGIN_EVENT_TABLE(EqualizationDialog,wxDialog)
    EVT_BUTTON( ID_SAVEAS, EqualizationDialog::OnSaveAs )
    EVT_BUTTON( ID_DELETE, EqualizationDialog::OnDelete )
    EVT_BUTTON( ID_CLEAR, EqualizationDialog::OnClear )
-#ifdef EXPERIMENTAL_EQ_INVERT
    EVT_BUTTON( ID_INVERT, EqualizationDialog::OnInvert )
-#endif
 
    EVT_BUTTON( ID_EFFECT_PREVIEW, EqualizationDialog::OnPreview )
    EVT_BUTTON( wxID_OK, EqualizationDialog::OnOk )
@@ -1399,12 +1397,10 @@ void EqualizationDialog::MakeEqualizationDialog()
    mDelete = new wxButton( this, ID_DELETE, _("Delete") );
    szrC->Add( mDelete, 0, wxALIGN_CENTRE|wxLEFT, 4 );
 
-   btn = new wxButton( this, ID_CLEAR, _("Flat"));
+   btn = new wxButton( this, ID_CLEAR, _("Flatten"));
    szrC->Add( btn, 0, wxALIGN_CENTRE | wxALL, 4 );
-#ifdef EXPERIMENTAL_EQ_INVERT
    btn = new wxButton( this, ID_INVERT, _("Invert"));
    szrC->Add( btn, 0, wxALIGN_CENTRE | wxALL, 4 );
-#endif
    mGridOnOff = new wxCheckBox(this, GridOnOffID, _("Grids"),
                             wxDefaultPosition, wxDefaultSize,
                             wxALIGN_RIGHT);
@@ -2833,7 +2829,6 @@ void EqualizationDialog::OnClear(wxCommandEvent &event)
    EnvelopeUpdated();
 }
 
-#ifdef EXPERIMENTAL_EQ_INVERT
 void EqualizationDialog::OnInvert(wxCommandEvent &event) // Inverts any curve
 {
    if(!drawMode)   // Graphic (Slider) mode. Invert the sliders.
@@ -2907,7 +2902,6 @@ void EqualizationDialog::OnInvert(wxCommandEvent &event) // Inverts any curve
    mPanel->Refresh(false);
    EnvelopeUpdated();
 }
-#endif
 
 void EqualizationDialog::OnErase(wxEraseEvent &event)
 {
diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h
index 4a06d83d7..4df6e5603 100644
--- a/src/effects/Equalization.h
+++ b/src/effects/Equalization.h
@@ -282,9 +282,7 @@ private:
       ID_SAVEAS,
       ID_DELETE,
       ID_CLEAR,
-#ifdef EXPERIMENTAL_EQ_INVERT
       ID_INVERT,
-#endif
       drawRadioID,
       sliderRadioID,
       ID_INTERP,
@@ -314,9 +312,7 @@ private:
    void OnSaveAs( wxCommandEvent &event );
    void OnDelete( wxCommandEvent &event );
    void OnClear( wxCommandEvent &event );
-#ifdef EXPERIMENTAL_EQ_INVERT
    void OnInvert( wxCommandEvent &event );
-#endif
    void OnPreview(wxCommandEvent &event);
    void OnOk( wxCommandEvent &event );
    void OnCancel( wxCommandEvent &event );