diff --git a/locale/POTFILES.in b/locale/POTFILES.in index 8f241e849..a8f7ec70b 100644 --- a/locale/POTFILES.in +++ b/locale/POTFILES.in @@ -23,6 +23,7 @@ src/AudacityLogger.cpp src/AudacityLogger.h src/AudioIO.cpp src/AudioIO.h +src/AudioIOListener.h src/AutoRecovery.cpp src/AutoRecovery.h src/BatchCommandDialog.cpp @@ -41,8 +42,12 @@ src/CrossFade.cpp src/CrossFade.h src/Dependencies.cpp src/Dependencies.h +src/DeviceChange.cpp +src/DeviceChange.h src/DeviceManager.cpp src/DeviceManager.h +src/Diags.cpp +src/Diags.h src/DirManager.cpp src/DirManager.h src/Dither.cpp @@ -121,12 +126,14 @@ src/RealFFTf48x.cpp src/RealFFTf48x.h src/Resample.cpp src/Resample.h +src/RevisionIdent.h src/RingBuffer.cpp src/RingBuffer.h src/SampleFormat.cpp src/SampleFormat.h src/Screenshot.cpp src/Screenshot.h +src/SelectedRegion.cpp src/SelectedRegion.h src/Sequence.cpp src/Sequence.h @@ -343,6 +350,7 @@ src/effects/VST/VSTEffect.h src/effects/VST/aeffectx.h src/effects/Wahwah.cpp src/effects/Wahwah.h +src/effects/audiounits/AudioUnitCocoaHelper.h src/effects/audiounits/AudioUnitEffect.cpp src/effects/audiounits/AudioUnitEffect.h src/effects/ladspa/LadspaEffect.cpp diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp index ea90e8cf9..be6e704a7 100644 --- a/src/AudioIO.cpp +++ b/src/AudioIO.cpp @@ -302,6 +302,7 @@ writing audio. #include "Prefs.h" #include "Project.h" #include "WaveTrack.h" +#include "AutoRecovery.h" #include "toolbars/ControlToolBar.h" #include "widgets/Meter.h" diff --git a/src/AudioIOListener.h b/src/AudioIOListener.h index db15ac4e4..0340c7ff8 100644 --- a/src/AudioIOListener.h +++ b/src/AudioIOListener.h @@ -15,7 +15,7 @@ #include -#include "AutoRecovery.h" +class AutoSaveFile; class AUDACITY_DLL_API AudioIOListener { public: diff --git a/src/Makefile.in b/src/Makefile.in index 48fae31d7..413657a21 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -279,28 +279,29 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ BatchProcessDialog.cpp BatchProcessDialog.h Benchmark.cpp \ Benchmark.h CaptureEvents.cpp CaptureEvents.h Dependencies.cpp \ Dependencies.h DeviceChange.cpp DeviceChange.h \ - DeviceManager.cpp DeviceManager.h Envelope.cpp Envelope.h \ - Experimental.h FFmpeg.cpp FFmpeg.h FFT.cpp FFT.h FileIO.cpp \ - FileIO.h FileNames.cpp FileNames.h float_cast.h FreqWindow.cpp \ - FreqWindow.h HelpText.cpp HelpText.h HistoryWindow.cpp \ - HistoryWindow.h ImageManipulation.cpp ImageManipulation.h \ - InterpolateAudio.cpp InterpolateAudio.h LabelDialog.cpp \ - LabelDialog.h LabelTrack.cpp LabelTrack.h LangChoice.cpp \ - LangChoice.h Languages.cpp Languages.h Legacy.cpp Legacy.h \ - Lyrics.cpp Lyrics.h LyricsWindow.cpp LyricsWindow.h \ - MacroMagic.h Matrix.cpp Matrix.h Menus.cpp Menus.h Mix.cpp \ - Mix.h MixerBoard.cpp MixerBoard.h ModuleManager.cpp \ - ModuleManager.h PitchName.cpp PitchName.h \ - PlatformCompatibility.cpp PlatformCompatibility.h \ - PluginManager.cpp PluginManager.h Printing.cpp Printing.h \ - Profiler.cpp Profiler.h Project.cpp Project.h RealFFTf.cpp \ - RealFFTf.h RealFFTf48x.cpp RealFFTf48x.h Resample.cpp \ - Resample.h RevisionIdent.h RingBuffer.cpp RingBuffer.h \ - Screenshot.cpp Screenshot.h SelectedRegion.cpp \ - SelectedRegion.h Shuttle.cpp Shuttle.h ShuttleGui.cpp \ - ShuttleGui.h ShuttlePrefs.cpp ShuttlePrefs.h Snap.cpp Snap.h \ - SoundActivatedRecord.cpp SoundActivatedRecord.h Spectrum.cpp \ - Spectrum.h SplashDialog.cpp SplashDialog.h SseMathFuncs.cpp \ + DeviceManager.cpp DeviceManager.h Diags.cpp Diags.h \ + Envelope.cpp Envelope.h Experimental.h FFmpeg.cpp FFmpeg.h \ + FFT.cpp FFT.h FileIO.cpp FileIO.h FileNames.cpp FileNames.h \ + float_cast.h FreqWindow.cpp FreqWindow.h HelpText.cpp \ + HelpText.h HistoryWindow.cpp HistoryWindow.h \ + ImageManipulation.cpp ImageManipulation.h InterpolateAudio.cpp \ + InterpolateAudio.h LabelDialog.cpp LabelDialog.h \ + LabelTrack.cpp LabelTrack.h LangChoice.cpp LangChoice.h \ + Languages.cpp Languages.h Legacy.cpp Legacy.h Lyrics.cpp \ + Lyrics.h LyricsWindow.cpp LyricsWindow.h MacroMagic.h \ + Matrix.cpp Matrix.h Menus.cpp Menus.h Mix.cpp Mix.h \ + MixerBoard.cpp MixerBoard.h ModuleManager.cpp ModuleManager.h \ + PitchName.cpp PitchName.h PlatformCompatibility.cpp \ + PlatformCompatibility.h PluginManager.cpp PluginManager.h \ + Printing.cpp Printing.h Profiler.cpp Profiler.h Project.cpp \ + Project.h RealFFTf.cpp RealFFTf.h RealFFTf48x.cpp \ + RealFFTf48x.h Resample.cpp Resample.h RevisionIdent.h \ + RingBuffer.cpp RingBuffer.h Screenshot.cpp Screenshot.h \ + SelectedRegion.cpp SelectedRegion.h Shuttle.cpp Shuttle.h \ + ShuttleGui.cpp ShuttleGui.h ShuttlePrefs.cpp ShuttlePrefs.h \ + Snap.cpp Snap.h SoundActivatedRecord.cpp \ + SoundActivatedRecord.h Spectrum.cpp Spectrum.h \ + SplashDialog.cpp SplashDialog.h SseMathFuncs.cpp \ SseMathFuncs.h Tags.cpp Tags.h Theme.cpp Theme.h \ ThemeAsCeeCode.h TimeDialog.cpp TimeDialog.h \ TimerRecordDialog.cpp TimerRecordDialog.h TimeTrack.cpp \ @@ -514,11 +515,11 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \ audacity-Benchmark.$(OBJEXT) audacity-CaptureEvents.$(OBJEXT) \ audacity-Dependencies.$(OBJEXT) \ audacity-DeviceChange.$(OBJEXT) \ - audacity-DeviceManager.$(OBJEXT) audacity-Envelope.$(OBJEXT) \ - audacity-FFmpeg.$(OBJEXT) audacity-FFT.$(OBJEXT) \ - audacity-FileIO.$(OBJEXT) audacity-FileNames.$(OBJEXT) \ - audacity-FreqWindow.$(OBJEXT) audacity-HelpText.$(OBJEXT) \ - audacity-HistoryWindow.$(OBJEXT) \ + audacity-DeviceManager.$(OBJEXT) audacity-Diags.$(OBJEXT) \ + audacity-Envelope.$(OBJEXT) audacity-FFmpeg.$(OBJEXT) \ + audacity-FFT.$(OBJEXT) audacity-FileIO.$(OBJEXT) \ + audacity-FileNames.$(OBJEXT) audacity-FreqWindow.$(OBJEXT) \ + audacity-HelpText.$(OBJEXT) audacity-HistoryWindow.$(OBJEXT) \ audacity-ImageManipulation.$(OBJEXT) \ audacity-InterpolateAudio.$(OBJEXT) \ audacity-LabelDialog.$(OBJEXT) audacity-LabelTrack.$(OBJEXT) \ @@ -1137,28 +1138,29 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ BatchProcessDialog.cpp BatchProcessDialog.h Benchmark.cpp \ Benchmark.h CaptureEvents.cpp CaptureEvents.h Dependencies.cpp \ Dependencies.h DeviceChange.cpp DeviceChange.h \ - DeviceManager.cpp DeviceManager.h Envelope.cpp Envelope.h \ - Experimental.h FFmpeg.cpp FFmpeg.h FFT.cpp FFT.h FileIO.cpp \ - FileIO.h FileNames.cpp FileNames.h float_cast.h FreqWindow.cpp \ - FreqWindow.h HelpText.cpp HelpText.h HistoryWindow.cpp \ - HistoryWindow.h ImageManipulation.cpp ImageManipulation.h \ - InterpolateAudio.cpp InterpolateAudio.h LabelDialog.cpp \ - LabelDialog.h LabelTrack.cpp LabelTrack.h LangChoice.cpp \ - LangChoice.h Languages.cpp Languages.h Legacy.cpp Legacy.h \ - Lyrics.cpp Lyrics.h LyricsWindow.cpp LyricsWindow.h \ - MacroMagic.h Matrix.cpp Matrix.h Menus.cpp Menus.h Mix.cpp \ - Mix.h MixerBoard.cpp MixerBoard.h ModuleManager.cpp \ - ModuleManager.h PitchName.cpp PitchName.h \ - PlatformCompatibility.cpp PlatformCompatibility.h \ - PluginManager.cpp PluginManager.h Printing.cpp Printing.h \ - Profiler.cpp Profiler.h Project.cpp Project.h RealFFTf.cpp \ - RealFFTf.h RealFFTf48x.cpp RealFFTf48x.h Resample.cpp \ - Resample.h RevisionIdent.h RingBuffer.cpp RingBuffer.h \ - Screenshot.cpp Screenshot.h SelectedRegion.cpp \ - SelectedRegion.h Shuttle.cpp Shuttle.h ShuttleGui.cpp \ - ShuttleGui.h ShuttlePrefs.cpp ShuttlePrefs.h Snap.cpp Snap.h \ - SoundActivatedRecord.cpp SoundActivatedRecord.h Spectrum.cpp \ - Spectrum.h SplashDialog.cpp SplashDialog.h SseMathFuncs.cpp \ + DeviceManager.cpp DeviceManager.h Diags.cpp Diags.h \ + Envelope.cpp Envelope.h Experimental.h FFmpeg.cpp FFmpeg.h \ + FFT.cpp FFT.h FileIO.cpp FileIO.h FileNames.cpp FileNames.h \ + float_cast.h FreqWindow.cpp FreqWindow.h HelpText.cpp \ + HelpText.h HistoryWindow.cpp HistoryWindow.h \ + ImageManipulation.cpp ImageManipulation.h InterpolateAudio.cpp \ + InterpolateAudio.h LabelDialog.cpp LabelDialog.h \ + LabelTrack.cpp LabelTrack.h LangChoice.cpp LangChoice.h \ + Languages.cpp Languages.h Legacy.cpp Legacy.h Lyrics.cpp \ + Lyrics.h LyricsWindow.cpp LyricsWindow.h MacroMagic.h \ + Matrix.cpp Matrix.h Menus.cpp Menus.h Mix.cpp Mix.h \ + MixerBoard.cpp MixerBoard.h ModuleManager.cpp ModuleManager.h \ + PitchName.cpp PitchName.h PlatformCompatibility.cpp \ + PlatformCompatibility.h PluginManager.cpp PluginManager.h \ + Printing.cpp Printing.h Profiler.cpp Profiler.h Project.cpp \ + Project.h RealFFTf.cpp RealFFTf.h RealFFTf48x.cpp \ + RealFFTf48x.h Resample.cpp Resample.h RevisionIdent.h \ + RingBuffer.cpp RingBuffer.h Screenshot.cpp Screenshot.h \ + SelectedRegion.cpp SelectedRegion.h Shuttle.cpp Shuttle.h \ + ShuttleGui.cpp ShuttleGui.h ShuttlePrefs.cpp ShuttlePrefs.h \ + Snap.cpp Snap.h SoundActivatedRecord.cpp \ + SoundActivatedRecord.h Spectrum.cpp Spectrum.h \ + SplashDialog.cpp SplashDialog.h SseMathFuncs.cpp \ SseMathFuncs.h Tags.cpp Tags.h Theme.cpp Theme.h \ ThemeAsCeeCode.h TimeDialog.cpp TimeDialog.h \ TimerRecordDialog.cpp TimerRecordDialog.h TimeTrack.cpp \ @@ -1963,6 +1965,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Dependencies.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-DeviceChange.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-DeviceManager.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Diags.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-DirManager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Dither.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Envelope.Po@am__quote@ @@ -2777,6 +2780,20 @@ audacity-DeviceManager.obj: DeviceManager.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o audacity-DeviceManager.obj `if test -f 'DeviceManager.cpp'; then $(CYGPATH_W) 'DeviceManager.cpp'; else $(CYGPATH_W) '$(srcdir)/DeviceManager.cpp'; fi` +audacity-Diags.o: Diags.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT audacity-Diags.o -MD -MP -MF $(DEPDIR)/audacity-Diags.Tpo -c -o audacity-Diags.o `test -f 'Diags.cpp' || echo '$(srcdir)/'`Diags.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-Diags.Tpo $(DEPDIR)/audacity-Diags.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Diags.cpp' object='audacity-Diags.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o audacity-Diags.o `test -f 'Diags.cpp' || echo '$(srcdir)/'`Diags.cpp + +audacity-Diags.obj: Diags.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT audacity-Diags.obj -MD -MP -MF $(DEPDIR)/audacity-Diags.Tpo -c -o audacity-Diags.obj `if test -f 'Diags.cpp'; then $(CYGPATH_W) 'Diags.cpp'; else $(CYGPATH_W) '$(srcdir)/Diags.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-Diags.Tpo $(DEPDIR)/audacity-Diags.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Diags.cpp' object='audacity-Diags.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o audacity-Diags.obj `if test -f 'Diags.cpp'; then $(CYGPATH_W) 'Diags.cpp'; else $(CYGPATH_W) '$(srcdir)/Diags.cpp'; fi` + audacity-Envelope.o: Envelope.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT audacity-Envelope.o -MD -MP -MF $(DEPDIR)/audacity-Envelope.Tpo -c -o audacity-Envelope.o `test -f 'Envelope.cpp' || echo '$(srcdir)/'`Envelope.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-Envelope.Tpo $(DEPDIR)/audacity-Envelope.Po diff --git a/src/Project.h b/src/Project.h index 88e681051..a63cc7114 100644 --- a/src/Project.h +++ b/src/Project.h @@ -52,6 +52,7 @@ class wxScrollBar; class wxPanel; class AudacityProject; +class AutoSaveFile; class Importer; class ODLock; class RecordingRecoveryHandler; diff --git a/src/UndoManager.cpp b/src/UndoManager.cpp index e64fbc4b6..ba37f20b7 100644 --- a/src/UndoManager.cpp +++ b/src/UndoManager.cpp @@ -25,6 +25,7 @@ UndoManager #include #include "BlockFile.h" +#include "Diags.h" #include "Internat.h" #include "Sequence.h" #include "Track.h"