Inserting CLEANSPEECH ifdef's around anything CleanSpeech so that CleanSpeech can be removed easily in the (not to distant) future. The idea is never to turn CLEANSPEECH on, but fix any (unexpected) differences this may make.

src/prefs/BatchPrefs.cpp

@@ -44,9 +44,11 @@
 BEGIN_EVENT_TABLE(BatchPrefs, wxPanel)
 END_EVENT_TABLE()
 
+#ifdef CLEANSPEECH
 enum { CleanSpeechID,
    MP3ConversionID,
 };
+#endif   // CLEANSPEECH
 
 /// Constructor
 BatchPrefs::BatchPrefs(wxWindow * parent):
@@ -78,8 +80,10 @@ void BatchPrefs::PopulateOrExchange( ShuttleGui & S )
       S.TieCheckBox( _("&Don't apply effects in batch mode"),  
          wxT("/Batch/Debug"), false);
 #endif
+#ifdef CLEANSPEECH
 //      S.TieCheckBox( _("Cl&eanSpeech Mode (Customized GUI)"), 
 //         wxT("/Batch/CleanSpeechMode"), false);
+#endif   // CLEANSPEECH
    }
    S.EndStatic();
    S.EndHorizontalLay();
@@ -87,6 +91,7 @@ void BatchPrefs::PopulateOrExchange( ShuttleGui & S )
    return;
 }
 
+#ifdef CLEANSPEECH
 // This commented out code might be useful as a first step if we want an immediate response to 
 // switching in and out of CleanSpeech mode.
 // As things currently stand, the batch commands available will NOT reflect changes in
@@ -97,6 +102,7 @@ void BatchPrefs::PopulateOrExchange( ShuttleGui & S )
    mode = gPrefs->Read(wxT("/Batch/CleanSpeechMode"), 1L);
    proj->GetControlToolBar()->SetCleanSpeechMode(mode == 1);
 #endif
+#endif   // CLEANSPEECH
 
 /// Send changed values back to Prefs, and update Audacity.
 bool BatchPrefs::Apply()
@@ -104,6 +110,7 @@ bool BatchPrefs::Apply()
    ShuttleGui S( this, eIsSavingToPrefs );
    PopulateOrExchange( S );
 
+#ifdef CLEANSPEECH
    unsigned mode;
    //mode = gPrefs->Read(wxT("/Batch/CleanSpeechMode"), 1L);
    mode = 0;
@@ -113,6 +120,7 @@ bool BatchPrefs::Apply()
          gAudacityProjects[i]->SetCleanSpeechMode(mode == 1);
          gAudacityProjects[i]->mToolManager->LayoutToolBars(); // Just to add/remove the CleanSpeech button.
       }
+#endif   // CLEANSPEECH
    return true;
 }