diff --git a/src/AColor.h b/src/AColor.h index 0d0307b2a..0c2281555 100644 --- a/src/AColor.h +++ b/src/AColor.h @@ -14,6 +14,7 @@ #ifndef __AUDACITY_COLOR__ #define __AUDACITY_COLOR__ +#include "MemoryX.h" #include // member variable #include // member variable diff --git a/src/AboutDialog.h b/src/AboutDialog.h index 3ac74924e..8c481a872 100644 --- a/src/AboutDialog.h +++ b/src/AboutDialog.h @@ -11,6 +11,7 @@ #ifndef __AUDACITY_ABOUT_DLG__ #define __AUDACITY_ABOUT_DLG__ +#include "MemoryX.h" #include #include "widgets/wxPanelWrapper.h" // to inherit diff --git a/src/AdornedRulerPanel.h b/src/AdornedRulerPanel.h index 7d2f95c35..0af6c913a 100644 --- a/src/AdornedRulerPanel.h +++ b/src/AdornedRulerPanel.h @@ -14,6 +14,8 @@ #include "CellularPanel.h" #include "widgets/Ruler.h" // member variable +#include "MemoryX.h" + class ViewInfo; class AudacityProject; class SnapManager; diff --git a/src/AudacityApp.h b/src/AudacityApp.h index 7dc1cec36..f5f15693d 100644 --- a/src/AudacityApp.h +++ b/src/AudacityApp.h @@ -19,6 +19,7 @@ #include "Experimental.h" +#include "MemoryX.h" #include // to inherit #include // for wxDIR_FILES #include // member variable diff --git a/src/AudacityHeaders.h b/src/AudacityHeaders.h index 74d9d846f..66a4583fa 100644 --- a/src/AudacityHeaders.h +++ b/src/AudacityHeaders.h @@ -53,18 +53,23 @@ #include "FileFormats.h" #include "FreqWindow.h" #include "ImageManipulation.h" +#include "Internat.h" #include "LabelTrack.h" #include "Mix.h" #include "NoteTrack.h" #include "Prefs.h" #include "Project.h" +#include "SampleFormat.h" #include "Sequence.h" #include "TimeTrack.h" +#include "Track.h" #include "UndoManager.h" +#include "ViewInfo.h" #include "WaveTrack.h" #include "widgets/ASlider.h" #include "widgets/ProgressDialog.h" #include "widgets/Ruler.h" +#include "xml/XMLTagHandler.h" // PRL: These lines allow you to remove Project.h above. // They must be included before the definition of macro NEW below. diff --git a/src/AudioIO.h b/src/AudioIO.h index a3db1e181..322361c61 100644 --- a/src/AudioIO.h +++ b/src/AudioIO.h @@ -19,6 +19,7 @@ #include "portaudio.h" +#include "MemoryX.h" #include #include #include diff --git a/src/AutoRecovery.h b/src/AutoRecovery.h index a79072516..1be3c6128 100644 --- a/src/AutoRecovery.h +++ b/src/AutoRecovery.h @@ -12,6 +12,7 @@ #define __AUDACITY_AUTORECOVERY__ #include "xml/XMLTagHandler.h" +#include "xml/XMLWriter.h" #include // member variables diff --git a/src/BlockFile.h b/src/BlockFile.h index cab8b5f20..ad5d30b31 100644 --- a/src/BlockFile.h +++ b/src/BlockFile.h @@ -12,6 +12,8 @@ #ifndef __AUDACITY_BLOCKFILE__ #define __AUDACITY_BLOCKFILE__ +#include "MemoryX.h" + #include "SampleFormat.h" #include "wxFileNameWrapper.h" // member variable diff --git a/src/CrossFade.h b/src/CrossFade.h index 425d5d2b0..1e10c4594 100644 --- a/src/CrossFade.h +++ b/src/CrossFade.h @@ -15,6 +15,7 @@ /// accepts a list of WaveClips and can do a mini-mixing /// to produce the desired crossfading +#include "SampleFormat.h" #include "WaveClip.h" diff --git a/src/DirManager.h b/src/DirManager.h index 62d853a02..022f3e704 100644 --- a/src/DirManager.h +++ b/src/DirManager.h @@ -11,6 +11,8 @@ #ifndef _DIRMANAGER_ #define _DIRMANAGER_ +#include "MemoryX.h" + #include "audacity/Types.h" #include "xml/XMLTagHandler.h" diff --git a/src/Envelope.h b/src/Envelope.h index c65c4bbf4..78afaf4e7 100644 --- a/src/Envelope.h +++ b/src/Envelope.h @@ -16,6 +16,7 @@ #include #include "xml/XMLTagHandler.h" +#include "Internat.h" class wxRect; class wxMouseEvent; diff --git a/src/FFmpeg.h b/src/FFmpeg.h index 261559ab8..56611cffc 100644 --- a/src/FFmpeg.h +++ b/src/FFmpeg.h @@ -18,6 +18,10 @@ Describes shared object that is used to access FFmpeg libraries. #include "Audacity.h" // for USE_* macros +#include "MemoryX.h" + +#include "Internat.h" + #include "widgets/wxPanelWrapper.h" // to inherit #if defined(__WXMSW__) diff --git a/src/FileFormats.h b/src/FileFormats.h index d459c9e36..77d763fdf 100644 --- a/src/FileFormats.h +++ b/src/FileFormats.h @@ -102,6 +102,7 @@ extern FileExtensions sf_get_all_extensions(); wxString sf_normalize_name(const char *name); // This function wrapper uses a mutex to serialize calls to the SndFile library. +#include "MemoryX.h" #include "ondemand/ODTaskThread.h" extern ODLock libSndFileMutex; template diff --git a/src/FreqWindow.h b/src/FreqWindow.h index 218cb5fed..0ec316f9b 100644 --- a/src/FreqWindow.h +++ b/src/FreqWindow.h @@ -11,6 +11,7 @@ #ifndef __AUDACITY_FREQ_WINDOW__ #define __AUDACITY_FREQ_WINDOW__ +#include "MemoryX.h" #include #include // member variable #include // to inherit diff --git a/src/LabelDialog.h b/src/LabelDialog.h index 91fdb959f..8a3d3df62 100644 --- a/src/LabelDialog.h +++ b/src/LabelDialog.h @@ -14,6 +14,7 @@ #include #include +#include "Internat.h" #include "widgets/wxPanelWrapper.h" // to inherit #include "audacity/ComponentInterface.h" // member variable diff --git a/src/Mix.h b/src/Mix.h index 6afe5869b..975a0e237 100644 --- a/src/Mix.h +++ b/src/Mix.h @@ -20,6 +20,7 @@ #ifndef __AUDACITY_MIX__ #define __AUDACITY_MIX__ +#include "MemoryX.h" #include "SampleFormat.h" #include diff --git a/src/Profiler.h b/src/Profiler.h index 37a8ba4b5..41f3586a6 100644 --- a/src/Profiler.h +++ b/src/Profiler.h @@ -26,6 +26,7 @@ but it will probably work fine if you use it on a high level. #ifndef __AUDACITY_PROFILER__ #define __AUDACITY_PROFILER__ +#include "MemoryX.h" #include #include #include "ondemand/ODTaskThread.h" diff --git a/src/Project.h b/src/Project.h index 5ed8eac77..62fb8d09f 100644 --- a/src/Project.h +++ b/src/Project.h @@ -29,6 +29,7 @@ #include "TrackPanelListener.h" #include "AudioIOListener.h" +#include "xml/XMLTagHandler.h" #include "toolbars/SelectionBarListener.h" #include "toolbars/SpectralSelectionBarListener.h" diff --git a/src/Resample.h b/src/Resample.h index 0a9bf246e..bfd1466fe 100644 --- a/src/Resample.h +++ b/src/Resample.h @@ -14,6 +14,8 @@ #include "Audacity.h" +#include "MemoryX.h" + #include "SampleFormat.h" class EnumSetting; diff --git a/src/Sequence.h b/src/Sequence.h index 26dbb0040..65338acfa 100644 --- a/src/Sequence.h +++ b/src/Sequence.h @@ -11,10 +11,12 @@ #ifndef __AUDACITY_SEQUENCE__ #define __AUDACITY_SEQUENCE__ +#include "MemoryX.h" #include #include "SampleFormat.h" #include "xml/XMLTagHandler.h" +#include "xml/XMLWriter.h" #include "ondemand/ODTaskThread.h" #include "audacity/Types.h" diff --git a/src/Snap.h b/src/Snap.h index 074625c92..b1ceab01f 100644 --- a/src/Snap.h +++ b/src/Snap.h @@ -18,6 +18,7 @@ #include #include #include "widgets/NumericTextCtrl.h" +#include "Internat.h" class AudacityProject; class Track; diff --git a/src/SplashDialog.h b/src/SplashDialog.h index 3b8e148f4..5e9454868 100644 --- a/src/SplashDialog.h +++ b/src/SplashDialog.h @@ -11,6 +11,7 @@ #ifndef __AUDACITY_SPLASH_DLG__ #define __AUDACITY_SPLASH_DLG__ +#include "MemoryX.h" #include "widgets/wxPanelWrapper.h" // to inherit class wxBitmap; diff --git a/src/Tags.h b/src/Tags.h index c8721ae16..9955799bf 100644 --- a/src/Tags.h +++ b/src/Tags.h @@ -33,6 +33,7 @@ #include "xml/XMLTagHandler.h" +#include "MemoryX.h" #include #include "widgets/wxPanelWrapper.h" // to inherit diff --git a/src/TimeDialog.h b/src/TimeDialog.h index 9c9a9c24a..f59ffed05 100644 --- a/src/TimeDialog.h +++ b/src/TimeDialog.h @@ -15,6 +15,7 @@ #include "widgets/NumericTextCtrl.h" // for NumericFormatSymbol #include "widgets/wxPanelWrapper.h" // to inherit +#include "Internat.h" class NumericTextCtrl; class ShuttleGui; diff --git a/src/Track.h b/src/Track.h index 76a089c1f..0bb0d5fbd 100644 --- a/src/Track.h +++ b/src/Track.h @@ -15,6 +15,7 @@ #include "Experimental.h" +#include "MemoryX.h" #include #include #include diff --git a/src/TrackPanel.h b/src/TrackPanel.h index df927807d..39196df78 100644 --- a/src/TrackPanel.h +++ b/src/TrackPanel.h @@ -14,6 +14,7 @@ #include "Audacity.h" // for USE_* macros #include "Experimental.h" +#include "MemoryX.h" #include #include // for wxUSE_* macros diff --git a/src/TrackPanelResizeHandle.h b/src/TrackPanelResizeHandle.h index 223b6f63c..18df6319b 100644 --- a/src/TrackPanelResizeHandle.h +++ b/src/TrackPanelResizeHandle.h @@ -11,6 +11,7 @@ Paul Licameli split from TrackPanel.cpp #ifndef __AUDACITY_TRACK_PANEL_RESIZE_HANDLE__ #define __AUDACITY_TRACK_PANEL_RESIZE_HANDLE__ +#include "MemoryX.h" #include "UIHandle.h" class Track; diff --git a/src/UndoManager.h b/src/UndoManager.h index 29d713c41..1e96672f5 100644 --- a/src/UndoManager.h +++ b/src/UndoManager.h @@ -49,6 +49,7 @@ #ifndef __AUDACITY_UNDOMANAGER__ #define __AUDACITY_UNDOMANAGER__ +#include "MemoryX.h" #include #include // to declare custom event types #include "ondemand/ODTaskThread.h" diff --git a/src/WaveClip.h b/src/WaveClip.h index 10b5579bb..b1a2c51d1 100644 --- a/src/WaveClip.h +++ b/src/WaveClip.h @@ -14,6 +14,7 @@ #include "Audacity.h" +#include "MemoryX.h" #include "SampleFormat.h" #include "ondemand/ODTaskThread.h" #include "xml/XMLTagHandler.h" diff --git a/src/WaveTrack.h b/src/WaveTrack.h index bcf682611..20720f460 100644 --- a/src/WaveTrack.h +++ b/src/WaveTrack.h @@ -12,6 +12,7 @@ #define __AUDACITY_WAVETRACK__ #include "Track.h" +#include "SampleFormat.h" #include #include diff --git a/src/blockfile/LegacyAliasBlockFile.h b/src/blockfile/LegacyAliasBlockFile.h index 6738ceb10..37cb1635c 100644 --- a/src/blockfile/LegacyAliasBlockFile.h +++ b/src/blockfile/LegacyAliasBlockFile.h @@ -11,6 +11,7 @@ #ifndef __AUDACITY_LEGACYALIASBLOCKFILE__ #define __AUDACITY_LEGACYALIASBLOCKFILE__ +#include "../BlockFile.h" #include "PCMAliasBlockFile.h" /// An AliasBlockFile that references uncompressed data in an existing file diff --git a/src/blockfile/ODDecodeBlockFile.h b/src/blockfile/ODDecodeBlockFile.h index e67962c5a..c0dbaa985 100644 --- a/src/blockfile/ODDecodeBlockFile.h +++ b/src/blockfile/ODDecodeBlockFile.h @@ -28,6 +28,8 @@ Also, see ODPCMAliasBlockFile for a similar file. #define __AUDACITY_ODDecodeBlockFile__ #include "SimpleBlockFile.h" +#include "../BlockFile.h" +#include "../ondemand/ODTaskThread.h" #include "../ondemand/ODDecodeTask.h" #include // member variable diff --git a/src/blockfile/ODPCMAliasBlockFile.h b/src/blockfile/ODPCMAliasBlockFile.h index 5c0cf794b..105866413 100644 --- a/src/blockfile/ODPCMAliasBlockFile.h +++ b/src/blockfile/ODPCMAliasBlockFile.h @@ -37,6 +37,8 @@ Some of these methods have been overridden only because they used the unsafe wxL #define __AUDACITY_ODPCMALIASBLOCKFILE__ #include "PCMAliasBlockFile.h" +#include "../BlockFile.h" +#include "../ondemand/ODTaskThread.h" /// An AliasBlockFile that references uncompressed data in an existing file class ODPCMAliasBlockFile final : public PCMAliasBlockFile diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h index c17d15dad..0199db908 100644 --- a/src/commands/AudacityCommand.h +++ b/src/commands/AudacityCommand.h @@ -13,13 +13,16 @@ #include "../Audacity.h" +#include "../MemoryX.h" #include +#include "../MemoryX.h" #include #include // to inherit #include "../widgets/wxPanelWrapper.h" // to inherit +#include "../Internat.h" #include "../include/audacity/ComponentInterface.h" #include "../include/audacity/EffectAutomationParameters.h" // for command automation diff --git a/src/commands/Command.h b/src/commands/Command.h index f2501e96a..2152c0a89 100644 --- a/src/commands/Command.h +++ b/src/commands/Command.h @@ -17,6 +17,9 @@ #ifndef __COMMAND__ #define __COMMAND__ +#include "../MemoryX.h" + +#include "CommandMisc.h" #include "CommandSignature.h" #include "../commands/AudacityCommand.h" diff --git a/src/commands/CommandContext.h b/src/commands/CommandContext.h index c80502411..8f2eb3f4b 100644 --- a/src/commands/CommandContext.h +++ b/src/commands/CommandContext.h @@ -12,6 +12,7 @@ #define __AUDACITY_COMMAND_CONTEXT__ #include "audacity/Types.h" +#include "../MemoryX.h" #include "Command.h" class AudacityProject; diff --git a/src/commands/CommandDirectory.h b/src/commands/CommandDirectory.h index 2122f4bed..e097ce9e4 100644 --- a/src/commands/CommandDirectory.h +++ b/src/commands/CommandDirectory.h @@ -23,6 +23,8 @@ they are kept separate to make things simpler. #ifndef __COMMANDDIRECTORY__ #define __COMMANDDIRECTORY__ +#include "../MemoryX.h" +#include "CommandMisc.h" #include "CommandType.h" class CommandOutputTargets; diff --git a/src/commands/CommandFunctors.h b/src/commands/CommandFunctors.h index 167213d2a..6449e57d0 100644 --- a/src/commands/CommandFunctors.h +++ b/src/commands/CommandFunctors.h @@ -9,6 +9,7 @@ #ifndef __AUDACITY_COMMAND_FUNCTORS__ #define __AUDACITY_COMMAND_FUNCTORS__ +#include "../MemoryX.h" #include "Command.h" class AudacityProject; diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h index 5387ef4a3..1026fcbe6 100644 --- a/src/commands/CommandManager.h +++ b/src/commands/CommandManager.h @@ -19,6 +19,7 @@ #include "CommandFunctors.h" #include "CommandFlag.h" +#include "../MemoryX.h" #include "Keyboard.h" #include diff --git a/src/commands/CommandTargets.h b/src/commands/CommandTargets.h index 2275de989..a4ea97f04 100644 --- a/src/commands/CommandTargets.h +++ b/src/commands/CommandTargets.h @@ -156,7 +156,7 @@ public: #if 0 -//#include "../widgets/ProgressDialog.h" // Member variable +#include "../widgets/ProgressDialog.h" // Member variable /// Sends command progress information to a ProgressDialog class GUIProgressTarget final : public CommandProgressTarget diff --git a/src/commands/CommandType.h b/src/commands/CommandType.h index 9fb343b2a..18a89b561 100644 --- a/src/commands/CommandType.h +++ b/src/commands/CommandType.h @@ -16,7 +16,9 @@ #ifndef __COMMANDTYPE__ #define __COMMANDTYPE__ +#include "CommandMisc.h" #include "CommandSignature.h" +#include "../MemoryX.h" #include "../commands/AudacityCommand.h" class OldStyleCommand; diff --git a/src/commands/ScreenshotCommand.h b/src/commands/ScreenshotCommand.h index f7e1a82ce..4fd327b97 100644 --- a/src/commands/ScreenshotCommand.h +++ b/src/commands/ScreenshotCommand.h @@ -14,6 +14,7 @@ #define __SCREENSHOT_COMMAND__ #include "Command.h" +#include "../commands/AudacityCommand.h" #include // member variable diff --git a/src/commands/SetClipCommand.h b/src/commands/SetClipCommand.h index 4c9b6a13f..4f118b205 100644 --- a/src/commands/SetClipCommand.h +++ b/src/commands/SetClipCommand.h @@ -16,6 +16,8 @@ #ifndef __SET_CLIP_COMMAND__ #define __SET_CLIP_COMMAND__ +#include "Command.h" +#include "CommandType.h" #include "SetTrackInfoCommand.h" #define SET_CLIP_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Set Clip") } diff --git a/src/commands/SetEnvelopeCommand.h b/src/commands/SetEnvelopeCommand.h index 6b365fa10..e5b058fc2 100644 --- a/src/commands/SetEnvelopeCommand.h +++ b/src/commands/SetEnvelopeCommand.h @@ -16,6 +16,8 @@ #ifndef __SET_ENVELOPE_COMMAND__ #define __SET_ENVELOPE_COMMAND__ +#include "Command.h" +#include "CommandType.h" #include "SetTrackInfoCommand.h" #define SET_ENVELOPE_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Set Envelope") } diff --git a/src/effects/Compressor.h b/src/effects/Compressor.h index a1a3aa4ee..8d1772ae9 100644 --- a/src/effects/Compressor.h +++ b/src/effects/Compressor.h @@ -12,6 +12,7 @@ #define __AUDACITY_EFFECT_COMPRESSOR__ #include "TwoPassSimpleMono.h" +#include "../SampleFormat.h" class wxCheckBox; class wxSlider; diff --git a/src/effects/Echo.h b/src/effects/Echo.h index f2084abb6..c0fc1dec0 100644 --- a/src/effects/Echo.h +++ b/src/effects/Echo.h @@ -13,6 +13,7 @@ #define __AUDACITY_EFFECT_ECHO__ #include "Effect.h" +#include "../SampleFormat.h" class ShuttleGui; diff --git a/src/effects/Effect.h b/src/effects/Effect.h index 2f41d3274..1f5382792 100644 --- a/src/effects/Effect.h +++ b/src/effects/Effect.h @@ -16,8 +16,10 @@ #include "../Experimental.h" +#include "../MemoryX.h" #include +#include "../MemoryX.h" #include class wxButton; @@ -29,7 +31,9 @@ class wxWindow; #include "audacity/ConfigInterface.h" #include "audacity/EffectInterface.h" +#include "../SampleFormat.h" #include "../SelectedRegion.h" +#include "../Internat.h" #include "../Track.h" diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h index 0afb6bbc6..2608f406d 100644 --- a/src/effects/Equalization.h +++ b/src/effects/Equalization.h @@ -20,7 +20,9 @@ #include // for wxUSE_* macros #include "Effect.h" +#include "../xml/XMLTagHandler.h" #include "../RealFFTf.h" +#include "../SampleFormat.h" #define EQUALIZATION_PLUGIN_SYMBOL \ ComponentInterfaceSymbol{ XO("Equalization") } diff --git a/src/effects/NoiseReduction.h b/src/effects/NoiseReduction.h index 6fc8614d4..b87e3c1d9 100644 --- a/src/effects/NoiseReduction.h +++ b/src/effects/NoiseReduction.h @@ -15,6 +15,8 @@ #include "Effect.h" +#include "../MemoryX.h" + #define NOISEREDUCTION_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Noise Reduction") } class EffectNoiseReduction final : public Effect { diff --git a/src/effects/NoiseRemoval.h b/src/effects/NoiseRemoval.h index 47c0595b8..a6dee084e 100644 --- a/src/effects/NoiseRemoval.h +++ b/src/effects/NoiseRemoval.h @@ -20,6 +20,9 @@ #include "Effect.h" +#include "../MemoryX.h" +#include "../SampleFormat.h" + class wxButton; class wxSizer; class wxSlider; diff --git a/src/effects/ladspa/LadspaEffect.h b/src/effects/ladspa/LadspaEffect.h index b2af1d0cc..68a70ca30 100644 --- a/src/effects/ladspa/LadspaEffect.h +++ b/src/effects/ladspa/LadspaEffect.h @@ -13,6 +13,7 @@ class wxStaticText; class wxTextCtrl; class wxCheckBox; +#include "../../MemoryX.h" #include // member variable #include "audacity/EffectInterface.h" diff --git a/src/effects/lv2/LV2Effect.h b/src/effects/lv2/LV2Effect.h index 6d0993122..2b1dabfb2 100644 --- a/src/effects/lv2/LV2Effect.h +++ b/src/effects/lv2/LV2Effect.h @@ -15,6 +15,7 @@ class wxArrayString; +#include "../../MemoryX.h" #include #include "lv2/lv2plug.in/ns/ext/atom/forge.h" diff --git a/src/effects/vamp/VampEffect.h b/src/effects/vamp/VampEffect.h index d3b406be8..9504a5851 100644 --- a/src/effects/vamp/VampEffect.h +++ b/src/effects/vamp/VampEffect.h @@ -17,6 +17,7 @@ #include +#include "../../SampleFormat.h" #include "../Effect.h" class wxStaticText; diff --git a/src/export/Export.h b/src/export/Export.h index 10d39757f..055e33cd1 100644 --- a/src/export/Export.h +++ b/src/export/Export.h @@ -11,6 +11,7 @@ #ifndef __AUDACITY_EXPORT__ #define __AUDACITY_EXPORT__ +#include "../MemoryX.h" #include #include // member variable #include "../SampleFormat.h" diff --git a/src/import/FormatClassifier.h b/src/import/FormatClassifier.h index 03a7585f4..a233bd9fd 100644 --- a/src/import/FormatClassifier.h +++ b/src/import/FormatClassifier.h @@ -12,6 +12,7 @@ #define __AUDACITY_FORMATCLASSIFIER_H_ #include +#include "../SampleFormat.h" #include "MultiFormatReader.h" #include "SpecPowerMeter.h" diff --git a/src/import/ImportPlugin.h b/src/import/ImportPlugin.h index 1ee2409d7..559844acf 100644 --- a/src/import/ImportPlugin.h +++ b/src/import/ImportPlugin.h @@ -59,6 +59,7 @@ but little else. #include "audacity/Types.h" #include "../Internat.h" +#include "../MemoryX.h" #include "ImportRaw.h" // defines TrackHolders diff --git a/src/ondemand/ODComputeSummaryTask.h b/src/ondemand/ODComputeSummaryTask.h index 2821aa8ea..9dca4ae55 100644 --- a/src/ondemand/ODComputeSummaryTask.h +++ b/src/ondemand/ODComputeSummaryTask.h @@ -21,6 +21,7 @@ updating the ODPCMAliasBlockFile and the GUI of the newly available data. #include #include "ODTask.h" +#include "ODTaskThread.h" #include "../Internat.h" class ODPCMAliasBlockFile; class WaveTrack; diff --git a/src/ondemand/ODDecodeFFmpegTask.h b/src/ondemand/ODDecodeFFmpegTask.h index b01c03269..05cd65f6c 100644 --- a/src/ondemand/ODDecodeFFmpegTask.h +++ b/src/ondemand/ODDecodeFFmpegTask.h @@ -14,11 +14,14 @@ #include "../Experimental.h" +#include "../MemoryX.h" + #ifdef EXPERIMENTAL_OD_FFMPEG #include "../import/ImportRaw.h" // for TrackHolders #include #include "ODDecodeTask.h" +#include "ODTaskThread.h" struct streamContext; using Scs = ArrayOf>; diff --git a/src/ondemand/ODDecodeFlacTask.h b/src/ondemand/ODDecodeFlacTask.h index 86ffd2e24..e44a02e8b 100644 --- a/src/ondemand/ODDecodeFlacTask.h +++ b/src/ondemand/ODDecodeFlacTask.h @@ -31,6 +31,7 @@ robust enough to allow all the user changes such as copy/paste, DELETE, and so o #include #include // data member #include "ODDecodeTask.h" +#include "ODTaskThread.h" #include "FLAC++/decoder.h" diff --git a/src/ondemand/ODDecodeTask.h b/src/ondemand/ODDecodeTask.h index a9859732a..dffcf113e 100644 --- a/src/ondemand/ODDecodeTask.h +++ b/src/ondemand/ODDecodeTask.h @@ -28,8 +28,10 @@ robust enough to allow all the user changes such as copy/paste, DELETE, and so o #ifndef __AUDACITY_ODDecodeTask__ #define __AUDACITY_ODDecodeTask__ +#include "../MemoryX.h" #include #include "ODTask.h" +#include "ODTaskThread.h" #include "../Internat.h" class ODDecodeBlockFile; class WaveTrack; diff --git a/src/ondemand/ODTask.h b/src/ondemand/ODTask.h index 4349f0cef..23801a5ad 100644 --- a/src/ondemand/ODTask.h +++ b/src/ondemand/ODTask.h @@ -23,8 +23,10 @@ in a background thread. #ifndef __AUDACITY_ODTASK__ #define __AUDACITY_ODTASK__ +#include "ODTaskThread.h" #include "../BlockFile.h" +#include "../MemoryX.h" #include #include // to declare custom event type class AudacityProject; diff --git a/src/ondemand/ODWaveTrackTaskQueue.h b/src/ondemand/ODWaveTrackTaskQueue.h index 5f22ae7d3..dbd239721 100644 --- a/src/ondemand/ODWaveTrackTaskQueue.h +++ b/src/ondemand/ODWaveTrackTaskQueue.h @@ -22,6 +22,7 @@ tasks associated with a WaveTrack. #ifndef __AUDACITY_ODWAVETRACKTASKQUEUE__ #define __AUDACITY_ODWAVETRACKTASKQUEUE__ +#include "../MemoryX.h" #include #include "ODTaskThread.h" class Track; diff --git a/src/prefs/PrefsDialog.h b/src/prefs/PrefsDialog.h index cdb5afdcd..4945ce032 100644 --- a/src/prefs/PrefsDialog.h +++ b/src/prefs/PrefsDialog.h @@ -15,6 +15,7 @@ #include #include #include "../widgets/wxPanelWrapper.h" // to inherit +#include "../Internat.h" class wxTreebook; class wxTreeEvent; diff --git a/src/toolbars/ControlToolBar.h b/src/toolbars/ControlToolBar.h index a3f45da7d..d791007bc 100644 --- a/src/toolbars/ControlToolBar.h +++ b/src/toolbars/ControlToolBar.h @@ -14,7 +14,9 @@ #ifndef __AUDACITY_CONTROL_TOOLBAR__ #define __AUDACITY_CONTROL_TOOLBAR__ +#include "../MemoryX.h" #include "ToolBar.h" +#include "../Theme.h" class wxBoxSizer; class wxCommandEvent; diff --git a/src/toolbars/DeviceToolBar.h b/src/toolbars/DeviceToolBar.h index 5c996a014..71c38c5ee 100644 --- a/src/toolbars/DeviceToolBar.h +++ b/src/toolbars/DeviceToolBar.h @@ -11,6 +11,7 @@ #ifndef __AUDACITY_DEVICE_TOOLBAR__ #define __AUDACITY_DEVICE_TOOLBAR__ +#include "../MemoryX.h" #include #include "ToolBar.h" diff --git a/src/toolbars/EditToolBar.h b/src/toolbars/EditToolBar.h index a81dc1bea..bc7918d5a 100644 --- a/src/toolbars/EditToolBar.h +++ b/src/toolbars/EditToolBar.h @@ -19,6 +19,7 @@ #include #include "ToolBar.h" +#include "../Theme.h" class wxCommandEvent; class wxDC; diff --git a/src/toolbars/MixerToolBar.h b/src/toolbars/MixerToolBar.h index 90da18a04..215657f64 100644 --- a/src/toolbars/MixerToolBar.h +++ b/src/toolbars/MixerToolBar.h @@ -11,6 +11,7 @@ #ifndef __AUDACITY_MIXER_TOOLBAR__ #define __AUDACITY_MIXER_TOOLBAR__ +#include "../MemoryX.h" #include "ToolBar.h" class wxSize; diff --git a/src/toolbars/ScrubbingToolBar.h b/src/toolbars/ScrubbingToolBar.h index 08e855f9f..7c9f99a88 100644 --- a/src/toolbars/ScrubbingToolBar.h +++ b/src/toolbars/ScrubbingToolBar.h @@ -17,6 +17,7 @@ #include #include "ToolBar.h" +#include "../Theme.h" class wxCommandEvent; class wxDC; diff --git a/src/toolbars/ToolDock.h b/src/toolbars/ToolDock.h index 0c152b7f9..996efd0b4 100644 --- a/src/toolbars/ToolDock.h +++ b/src/toolbars/ToolDock.h @@ -14,6 +14,7 @@ #define __AUDACITY_TOOLDOCK__ #include +#include "../MemoryX.h" // for std::move #include #include "ToolBar.h" diff --git a/src/toolbars/ToolManager.h b/src/toolbars/ToolManager.h index 84d70a52a..c779fa065 100644 --- a/src/toolbars/ToolManager.h +++ b/src/toolbars/ToolManager.h @@ -13,12 +13,14 @@ #ifndef __AUDACITY_TOOLMANAGER__ #define __AUDACITY_TOOLMANAGER__ +#include "../MemoryX.h" #include #include // to inherit #include // to inherit #include // member variable #include "ToolDock.h" +#include "ToolBar.h" class wxCommandEvent; class wxFrame; diff --git a/src/toolbars/ToolsToolBar.h b/src/toolbars/ToolsToolBar.h index a881d0d45..a50cab94a 100644 --- a/src/toolbars/ToolsToolBar.h +++ b/src/toolbars/ToolsToolBar.h @@ -18,6 +18,8 @@ #include "ToolBar.h" +#include "../Theme.h" + class wxCommandEvent; class wxDC; class wxGridSizer; diff --git a/src/toolbars/TranscriptionToolBar.h b/src/toolbars/TranscriptionToolBar.h index 0ccb97acd..c03f2c1e8 100644 --- a/src/toolbars/TranscriptionToolBar.h +++ b/src/toolbars/TranscriptionToolBar.h @@ -17,9 +17,11 @@ #include "ToolBar.h" +#include "../MemoryX.h" #include // member variable #include "audacity/Types.h" +#include "../Theme.h" class wxChoice; class wxCommandEvent; diff --git a/src/tracks/labeltrack/ui/LabelDefaultClickHandle.h b/src/tracks/labeltrack/ui/LabelDefaultClickHandle.h index 71927e527..6da34ff86 100644 --- a/src/tracks/labeltrack/ui/LabelDefaultClickHandle.h +++ b/src/tracks/labeltrack/ui/LabelDefaultClickHandle.h @@ -12,6 +12,7 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_LABEL_DEFAULT_CLICK_HANDLE__ #include "../../../UIHandle.h" +#include "../../../MemoryX.h" class wxMouseEvent; class LabelTrack; diff --git a/src/tracks/labeltrack/ui/LabelGlyphHandle.h b/src/tracks/labeltrack/ui/LabelGlyphHandle.h index a45655931..b83f46d81 100644 --- a/src/tracks/labeltrack/ui/LabelGlyphHandle.h +++ b/src/tracks/labeltrack/ui/LabelGlyphHandle.h @@ -12,6 +12,7 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_LABEL_GLYPH_HANDLE__ #include "LabelDefaultClickHandle.h" +#include "../../../MemoryX.h" class wxMouseState; class LabelTrack; diff --git a/src/tracks/labeltrack/ui/LabelTextHandle.h b/src/tracks/labeltrack/ui/LabelTextHandle.h index db568ce0c..0d1b80a6c 100644 --- a/src/tracks/labeltrack/ui/LabelTextHandle.h +++ b/src/tracks/labeltrack/ui/LabelTextHandle.h @@ -12,6 +12,7 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_LABEL_TEXT_HANDLE__ #include "LabelDefaultClickHandle.h" +#include "../../../MemoryX.h" #include "../../../SelectedRegion.h" class wxMouseState; diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h index ca9eb5aad..56d4ddb1f 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h @@ -14,6 +14,7 @@ Paul Licameli split from TrackPanel.cpp class wxMouseState; class NoteTrack; +#include "../../../../MemoryX.h" #include "../../../../UIHandle.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h index b75d851d6..84a378c9b 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h @@ -12,6 +12,7 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_NOTE_TRACK_CONTROLS__ #include "../../../ui/TrackControls.h" +#include "../../../../MemoryX.h" class MuteButtonHandle; class SoloButtonHandle; class NoteTrackButtonHandle; diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h index 479b6ca86..14a03ed17 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h @@ -14,6 +14,7 @@ Paul Licameli split from TrackPanel.cpp class wxMouseState; class NoteTrack; +#include "../../../../MemoryX.h" #include "../../../../UIHandle.h" class NoteTrackVZoomHandle : public UIHandle diff --git a/src/tracks/playabletrack/notetrack/ui/StretchHandle.h b/src/tracks/playabletrack/notetrack/ui/StretchHandle.h index 1592e5039..82d210440 100644 --- a/src/tracks/playabletrack/notetrack/ui/StretchHandle.h +++ b/src/tracks/playabletrack/notetrack/ui/StretchHandle.h @@ -13,6 +13,8 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../UIHandle.h" +#include "../../../../MemoryX.h" + class Alg_seq; class NoteTrack; class Track; diff --git a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h index 3d7835372..da08da2b6 100644 --- a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h @@ -11,7 +11,9 @@ Paul Licameli #ifndef __AUDACITY_CUTLINE_HANDLE__ #define __AUDACITY_CUTLINE_HANDLE__ +#include "../../../../MemoryX.h" #include "../../../../UIHandle.h" +#include "../../../../MemoryX.h" #include "../../../../WaveTrackLocation.h" class wxMouseEvent; diff --git a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h index 13793d9d6..8bb74f744 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h @@ -13,6 +13,7 @@ Paul Licameli #include "../../../../UIHandle.h" #include "audacity/Types.h" +#include "../../../../MemoryX.h" class wxMouseEvent; class wxMouseState; diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h index 8c45ffbbc..bee59773e 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h @@ -13,6 +13,7 @@ Paul Licameli split from TrackPanel.cpp class wxMouseState; class WaveTrack; +#include "../../../../MemoryX.h" #include "../../../../UIHandle.h" diff --git a/src/tracks/ui/BackgroundCell.h b/src/tracks/ui/BackgroundCell.h index 1b0bec329..c9810822e 100644 --- a/src/tracks/ui/BackgroundCell.h +++ b/src/tracks/ui/BackgroundCell.h @@ -12,6 +12,7 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_BACKGROUND_CELL__ #include "CommonTrackPanelCell.h" +#include "../../MemoryX.h" class AudacityProject; diff --git a/src/tracks/ui/ButtonHandle.h b/src/tracks/ui/ButtonHandle.h index b4384c813..04a33f4ac 100644 --- a/src/tracks/ui/ButtonHandle.h +++ b/src/tracks/ui/ButtonHandle.h @@ -12,6 +12,7 @@ Paul Licameli #define __AUDACITY_BUTTON_HANDLE__ #include "../../UIHandle.h" +#include "../../MemoryX.h" class wxMouseEvent; class wxMouseState; diff --git a/src/tracks/ui/CommonTrackPanelCell.h b/src/tracks/ui/CommonTrackPanelCell.h index 362150fa1..41dade441 100644 --- a/src/tracks/ui/CommonTrackPanelCell.h +++ b/src/tracks/ui/CommonTrackPanelCell.h @@ -12,6 +12,7 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_COMMON_TRACK_PANEL_CELL__ #include "../../TrackPanelCell.h" +#include "../../MemoryX.h" #include class Track; diff --git a/src/tracks/ui/EnvelopeHandle.h b/src/tracks/ui/EnvelopeHandle.h index e3139c7a9..e887d87f8 100644 --- a/src/tracks/ui/EnvelopeHandle.h +++ b/src/tracks/ui/EnvelopeHandle.h @@ -12,6 +12,7 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_ENVELOPE_HANDLE__ #include "../../UIHandle.h" +#include "../../MemoryX.h" #include diff --git a/src/tracks/ui/Scrubbing.h b/src/tracks/ui/Scrubbing.h index 6f95b6564..28235c603 100644 --- a/src/tracks/ui/Scrubbing.h +++ b/src/tracks/ui/Scrubbing.h @@ -13,10 +13,12 @@ Paul Licameli split from TrackPanel.cpp #include "../../Experimental.h" +#include "../../MemoryX.h" #include #include #include "../../widgets/Overlay.h" // to inherit +#include "../../commands/CommandFunctors.h" #include "../../commands/CommandContext.h" #include "../../commands/CommandManager.h" // for MenuTable #include "../../../include/audacity/Types.h" diff --git a/src/tracks/ui/SelectHandle.h b/src/tracks/ui/SelectHandle.h index c3e18eea6..6cba35b62 100644 --- a/src/tracks/ui/SelectHandle.h +++ b/src/tracks/ui/SelectHandle.h @@ -15,6 +15,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../SelectedRegion.h" #include "../../Snap.h" +#include "../../MemoryX.h" #include class SelectionStateChanger; diff --git a/src/tracks/ui/SliderHandle.h b/src/tracks/ui/SliderHandle.h index 981875f4e..b27a9e637 100644 --- a/src/tracks/ui/SliderHandle.h +++ b/src/tracks/ui/SliderHandle.h @@ -11,6 +11,7 @@ Paul Licameli #ifndef __AUDACITY_SLIDER_HANDLE__ #define __AUDACITY_SLIDER_HANDLE__ +#include "../../MemoryX.h" #include "../../UIHandle.h" class wxMouseEvent; diff --git a/src/tracks/ui/TimeShiftHandle.h b/src/tracks/ui/TimeShiftHandle.h index ee671a26f..782ce7a83 100644 --- a/src/tracks/ui/TimeShiftHandle.h +++ b/src/tracks/ui/TimeShiftHandle.h @@ -13,6 +13,8 @@ Paul Licameli #include "../../UIHandle.h" +#include "../../MemoryX.h" + #include "../../Snap.h" #include "../../Track.h" diff --git a/src/tracks/ui/TrackControls.h b/src/tracks/ui/TrackControls.h index 940521502..cf7c36e21 100644 --- a/src/tracks/ui/TrackControls.h +++ b/src/tracks/ui/TrackControls.h @@ -12,6 +12,7 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_TRACK_CONTROLS__ #include "CommonTrackPanelCell.h" +#include "../../MemoryX.h" class PopupMenuTable; class Track; diff --git a/src/tracks/ui/TrackSelectHandle.h b/src/tracks/ui/TrackSelectHandle.h index cbca1a382..4805c39fd 100644 --- a/src/tracks/ui/TrackSelectHandle.h +++ b/src/tracks/ui/TrackSelectHandle.h @@ -12,6 +12,7 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_TRACK_SELECT_HANDLE__ #include "../../UIHandle.h" +#include "../../MemoryX.h" class wxMouseEvent; class Track; diff --git a/src/tracks/ui/TrackVRulerControls.h b/src/tracks/ui/TrackVRulerControls.h index 7e3f2e10e..469ba3983 100644 --- a/src/tracks/ui/TrackVRulerControls.h +++ b/src/tracks/ui/TrackVRulerControls.h @@ -12,6 +12,7 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_TRACK_VRULER_CONTROLS__ #include "CommonTrackPanelCell.h" +#include "../../MemoryX.h" class Track; class wxDC; diff --git a/src/widgets/AButton.h b/src/widgets/AButton.h index a43ccd2e1..28731ca2b 100644 --- a/src/widgets/AButton.h +++ b/src/widgets/AButton.h @@ -12,6 +12,7 @@ #ifndef __AUDACITY_BUTTON__ #define __AUDACITY_BUTTON__ +#include "../MemoryX.h" #include #include // for wxUSE_* macros diff --git a/src/widgets/ASlider.h b/src/widgets/ASlider.h index 45a08c5f0..30030c5a1 100644 --- a/src/widgets/ASlider.h +++ b/src/widgets/ASlider.h @@ -13,6 +13,7 @@ #ifndef __AUDACITY_SLIDER__ #define __AUDACITY_SLIDER__ +#include "../MemoryX.h" #include // for wxUSE_* macros #include #include // member variable diff --git a/src/widgets/BackedPanel.h b/src/widgets/BackedPanel.h index 843606b62..bdfc0419d 100644 --- a/src/widgets/BackedPanel.h +++ b/src/widgets/BackedPanel.h @@ -9,6 +9,7 @@ #ifndef __AUDACITY_BACKED_PANEL__ #define __AUDACITY_BACKED_PANEL__ +#include "../MemoryX.h" #include // member variable #include "wxPanelWrapper.h" // to inherit diff --git a/src/widgets/ExpandingToolBar.h b/src/widgets/ExpandingToolBar.h index 75a5f9b88..92fe4f367 100644 --- a/src/widgets/ExpandingToolBar.h +++ b/src/widgets/ExpandingToolBar.h @@ -11,6 +11,7 @@ #ifndef __AUDACITY_EXPANDING_TOOL_BAR__ #define __AUDACITY_EXPANDING_TOOL_BAR__ +#include "../MemoryX.h" #include #include #include // use macros and typedefs in this header @@ -18,6 +19,7 @@ #include // to inherit #include "ImageRoll.h" +#include "wxPanelWrapper.h" // to inherit #include diff --git a/src/widgets/Grid.h b/src/widgets/Grid.h index 5ffc2dffa..92f5feafa 100644 --- a/src/widgets/Grid.h +++ b/src/widgets/Grid.h @@ -11,11 +11,13 @@ #ifndef __AUDACITY_WIDGETS_GRID__ #define __AUDACITY_WIDGETS_GRID__ +#include "../MemoryX.h" #include #include // for wxUSE_* macros #include #include // to inherit wxGridCellEditor #include "NumericTextCtrl.h" +#include "../Internat.h" #if wxUSE_ACCESSIBILITY class GridAx; diff --git a/src/widgets/ProgressDialog.h b/src/widgets/ProgressDialog.h index 12dec88e4..e2fcb946f 100644 --- a/src/widgets/ProgressDialog.h +++ b/src/widgets/ProgressDialog.h @@ -20,6 +20,7 @@ #include "../Audacity.h" +#include "../MemoryX.h" #include #include #include // member variable