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/AudacityApp.cpp

@@ -978,11 +978,13 @@ bool AudacityApp::OnInit()
    wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 );
 #endif
 
+#ifdef CLEANSPEECH
 //MERGE:
 //Everything now uses Audacity name for preferences.
 //(Audacity and CleanSpeech the same program and use
 //the same preferences file).
 //
+#endif   // CLEANSPEECH
 // LL: Moved here from InitPreferences() to ensure VST effect
 //     discovery writes configuration to the correct directory
 //     on OSX with case-sensitive file systems.
@@ -1044,7 +1046,9 @@ bool AudacityApp::OnInit()
    //
 
    wxString home = wxGetHomeDir();
+#ifdef CLEANSPEECH
    mAppHomeDir = home;
+#endif   // CLEANSPEECH
    theTheme.EnsureInitialised();
 
    // AColor depends on theTheme.
@@ -1145,6 +1149,7 @@ bool AudacityApp::OnInit()
    if (lang == wxT(""))
       lang = GetSystemLanguageCode();
 
+#ifdef CLEANSPEECH
 #ifdef NOT_RQD
 //TIDY-ME: (CleanSpeech) Language prompt??
 // The prompt for language only happens ONCE on a system.
@@ -1155,7 +1160,7 @@ bool AudacityApp::OnInit()
 //lda   if (lang == "")
 //lda      lang = ChooseLanguage(NULL);
 #endif
-
+#endif   // CLEANSPEECH
    mLocale = NULL;
    InitLang( lang );
 
@@ -1168,7 +1173,9 @@ bool AudacityApp::OnInit()
    }
 
    // More initialization
+#ifdef CLEANSPEECH
    InitCleanSpeech();
+#endif   // CLEANSPEECH
 
    InitDitherers();
    InitAudioIO();
@@ -1434,6 +1441,7 @@ void AudacityApp::OnReceiveCommand(AppCommandEvent &event)
    mCmdHandler->OnReceiveCommand(event);
 }
 
+#ifdef CLEANSPEECH   //is this actually useful?
 bool AudacityApp::InitCleanSpeech()
 {
    wxString userdatadir = FileNames::DataDir();
@@ -1482,6 +1490,7 @@ bool AudacityApp::InitCleanSpeech()
    gPrefs->Write(wxT("/Directories/PresetsDir"), presets);
    return true;
 }
+#endif   // CLEANSPEECH
 
 bool AudacityApp::InitTempDir()
 {