From 9569cfddf58cdba77840d2e0ab7eb941a3e2586c Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sat, 23 Mar 2019 14:08:09 -0400
Subject: [PATCH] More comments for including Audacity.h; fix one #ifdef in
 AudioIO.cpp

---
 src/AudioIO.cpp       | 6 +++---
 src/DeviceChange.h    | 2 +-
 src/DeviceManager.cpp | 2 +-
 src/LabelTrack.cpp    | 2 +-
 src/TrackArtist.cpp   | 2 +-
 src/float_cast.h      | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
index 4dbe9d1cb..570f02ff5 100644
--- a/src/AudioIO.cpp
+++ b/src/AudioIO.cpp
@@ -413,8 +413,8 @@ TimeTrack and AudioIOListener and whether the playback is looped.
 
 *//*******************************************************************/
 
-#include "Audacity.h"
-#include "AudioIO.h" // for USE_* macros
+#include "Audacity.h" // for USE_* macros
+#include "AudioIO.h"
 
 #include "Experimental.h"
 
@@ -2677,7 +2677,7 @@ void AudioIO::StopStream()
 
    mPlaybackTracks.clear();
    mCaptureTracks.clear();
-#ifdef HAVE_MIDI
+#ifdef USE_MIDI
    mMidiPlaybackTracks.clear();
 #endif
 
diff --git a/src/DeviceChange.h b/src/DeviceChange.h
index 4992e726b..b20f8919c 100644
--- a/src/DeviceChange.h
+++ b/src/DeviceChange.h
@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_DEVICECHANGE_H__
 #define __AUDACITY_DEVICECHANGE_H__
 
-#include "Audacity.h"
+#include "Audacity.h" // for HAVE_LIBUDEV_H
 
 #include "Experimental.h"
 
diff --git a/src/DeviceManager.cpp b/src/DeviceManager.cpp
index 01e420aae..775f39d57 100644
--- a/src/DeviceManager.cpp
+++ b/src/DeviceManager.cpp
@@ -37,7 +37,7 @@
 
 #include "AudioIO.h"
 
-#include "DeviceChange.h"
+#include "DeviceChange.h" // for HAVE_DEVICE_CHANGE
 #include "toolbars/DeviceToolBar.h"
 
 DeviceManager DeviceManager::dm;
diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp
index 87cbf2446..78cb2ba7a 100644
--- a/src/LabelTrack.cpp
+++ b/src/LabelTrack.cpp
@@ -28,7 +28,7 @@ for drawing different aspects of the label and its text box.
 
 *//*******************************************************************/
 
-#include "Audacity.h"
+#include "Audacity.h" // for HAVE_GTK
 #include "LabelTrack.h"
 
 #include "Experimental.h"
diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp
index 42e162745..e7a46260a 100644
--- a/src/TrackArtist.cpp
+++ b/src/TrackArtist.cpp
@@ -38,7 +38,7 @@ audio tracks.
 
 *//*******************************************************************/
 
-#include "Audacity.h" // for USE_* macros
+#include "Audacity.h" // for USE_* macros and HAVE_ALLOCA_H
 #include "TrackArtist.h"
 
 #include "Experimental.h"
diff --git a/src/float_cast.h b/src/float_cast.h
index 424c1127d..61d62ce72 100644
--- a/src/float_cast.h
+++ b/src/float_cast.h
@@ -35,7 +35,7 @@
 **		long int lrint  (double x) ;
 */
 
-#include "Audacity.h"
+#include "Audacity.h" // for HAVE_LRINT, HAVE_LRINTF
 
 /*	The presence of the required functions are detected during the configure
 **	process and the values HAVE_LRINT and HAVE_LRINTF are set accordingly in