diff --git a/locale/POTFILES.in b/locale/POTFILES.in index 40ff2dcc2..1d78ffad3 100644 --- a/locale/POTFILES.in +++ b/locale/POTFILES.in @@ -187,6 +187,8 @@ src/ProjectSelectionManager.cpp src/ProjectSelectionManager.h src/ProjectSettings.cpp src/ProjectSettings.h +src/ProjectStatus.cpp +src/ProjectStatus.h src/ProjectWindow.cpp src/ProjectWindow.h src/RealFFTf.cpp diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj index e7a89e545..f0ef58201 100644 --- a/mac/Audacity.xcodeproj/project.pbxproj +++ b/mac/Audacity.xcodeproj/project.pbxproj @@ -1234,10 +1234,11 @@ 5E18CFF322931D3D00E75250 /* AudacityMessageBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E18CFF222931D3D00E75250 /* AudacityMessageBox.cpp */; }; 5E19D655217D51190024D0B1 /* PluginMenus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E19D64C217D51190024D0B1 /* PluginMenus.cpp */; }; 5E19F59922A9665500E3F88E /* AutoRecoveryDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E19F59722A9665500E3F88E /* AutoRecoveryDialog.cpp */; }; + 5E1B0BCC22CBA4F3008AA220 /* ProjectStatus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E1B0BCA22CBA4F3008AA220 /* ProjectStatus.cpp */; }; 5E2A19941EED688500217B58 /* SelectionState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2A19921EED688500217B58 /* SelectionState.cpp */; }; - 5E2B3E6222BF9621005042E1 /* RealtimeEffectManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2B3E6022BF9621005042E1 /* RealtimeEffectManager.cpp */; }; 5E2B3E5C22BD9798005042E1 /* SelectUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2B3E5A22BD9798005042E1 /* SelectUtilities.cpp */; }; 5E2B3E5F22BD97A7005042E1 /* TrackUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2B3E5D22BD97A7005042E1 /* TrackUtilities.cpp */; }; + 5E2B3E6222BF9621005042E1 /* RealtimeEffectManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2B3E6022BF9621005042E1 /* RealtimeEffectManager.cpp */; }; 5E2BF3852193A2A500995694 /* TrackView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2BF3832193A2A500995694 /* TrackView.cpp */; }; 5E2BF3882193A2BD00995694 /* TimeTrackView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2BF3862193A2BD00995694 /* TimeTrackView.cpp */; }; 5E2BF38B2193A2E400995694 /* WaveTrackView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2BF3892193A2E400995694 /* WaveTrackView.cpp */; }; @@ -3238,15 +3239,17 @@ 5E19D64C217D51190024D0B1 /* PluginMenus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PluginMenus.cpp; path = menus/PluginMenus.cpp; sourceTree = ""; }; 5E19F59722A9665500E3F88E /* AutoRecoveryDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AutoRecoveryDialog.cpp; sourceTree = ""; }; 5E19F59822A9665500E3F88E /* AutoRecoveryDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoRecoveryDialog.h; sourceTree = ""; }; + 5E1B0BCA22CBA4F3008AA220 /* ProjectStatus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectStatus.cpp; sourceTree = ""; }; + 5E1B0BCB22CBA4F3008AA220 /* ProjectStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectStatus.h; sourceTree = ""; }; 5E1C3F4D218F7604002CD087 /* TrackPanelDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackPanelDrawable.h; sourceTree = ""; }; 5E2A19921EED688500217B58 /* SelectionState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectionState.cpp; sourceTree = ""; }; 5E2A19931EED688500217B58 /* SelectionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectionState.h; sourceTree = ""; }; - 5E2B3E6022BF9621005042E1 /* RealtimeEffectManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RealtimeEffectManager.cpp; sourceTree = ""; }; - 5E2B3E6122BF9621005042E1 /* RealtimeEffectManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealtimeEffectManager.h; sourceTree = ""; }; 5E2B3E5A22BD9798005042E1 /* SelectUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectUtilities.cpp; sourceTree = ""; }; 5E2B3E5B22BD9798005042E1 /* SelectUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectUtilities.h; sourceTree = ""; }; 5E2B3E5D22BD97A7005042E1 /* TrackUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrackUtilities.cpp; sourceTree = ""; }; 5E2B3E5E22BD97A7005042E1 /* TrackUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackUtilities.h; sourceTree = ""; }; + 5E2B3E6022BF9621005042E1 /* RealtimeEffectManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RealtimeEffectManager.cpp; sourceTree = ""; }; + 5E2B3E6122BF9621005042E1 /* RealtimeEffectManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealtimeEffectManager.h; sourceTree = ""; }; 5E2BF3832193A2A500995694 /* TrackView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrackView.cpp; sourceTree = ""; }; 5E2BF3842193A2A500995694 /* TrackView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackView.h; sourceTree = ""; }; 5E2BF3862193A2BD00995694 /* TimeTrackView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimeTrackView.cpp; sourceTree = ""; }; @@ -4440,6 +4443,7 @@ 5E135A3A229EDF2E0076E983 /* ProjectManager.cpp */, 5E3A530622AD277A00C4ADB8 /* ProjectSelectionManager.cpp */, 5E135A34229EDBE80076E983 /* ProjectSettings.cpp */, + 5E1B0BCA22CBA4F3008AA220 /* ProjectStatus.cpp */, 5E135A46229EE5530076E983 /* ProjectWindow.cpp */, 28DABFBC0FF19DB100AC7848 /* RealFFTf.cpp */, EDFCEBA218894B2A00C98E51 /* RealFFTf48x.cpp */, @@ -4573,6 +4577,7 @@ 5E135A3B229EDF2E0076E983 /* ProjectManager.h */, 5E3A530722AD277A00C4ADB8 /* ProjectSelectionManager.h */, 5E135A35229EDBE80076E983 /* ProjectSettings.h */, + 5E1B0BCB22CBA4F3008AA220 /* ProjectStatus.h */, 5E135A47229EE5530076E983 /* ProjectWindow.h */, 28DABFBD0FF19DB100AC7848 /* RealFFTf.h */, EDFCEBA318894B2A00C98E51 /* RealFFTf48x.h */, @@ -8671,6 +8676,7 @@ 287E207F102561F300BF47A2 /* PluginManager.cpp in Sources */, 5E7396501DAFD98400BA0A4D /* SliderHandle.cpp in Sources */, 28851FAB1027F16500152EE1 /* Command.cpp in Sources */, + 5E1B0BCC22CBA4F3008AA220 /* ProjectStatus.cpp in Sources */, 282B70341B682342009A1618 /* WaveformSettings.cpp in Sources */, 28851FAC1027F16500152EE1 /* CommandSignature.cpp in Sources */, 5E1512621DB000DC00702E29 /* TimeTrackVRulerControls.cpp in Sources */, diff --git a/src/Makefile.am b/src/Makefile.am index 0e69fe670..28b7f7d96 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -238,6 +238,8 @@ audacity_SOURCES = \ ProjectSelectionManager.h \ ProjectSettings.cpp \ ProjectSettings.h \ + ProjectStatus.cpp \ + ProjectStatus.h \ ProjectWindow.cpp \ ProjectWindow.h \ RealFFTf.cpp \ diff --git a/src/Makefile.in b/src/Makefile.in index ac4c3b1b0..ebe29c0a3 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -328,15 +328,15 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ ProjectHistory.cpp ProjectHistory.h ProjectManager.cpp \ ProjectManager.h ProjectSelectionManager.cpp \ ProjectSelectionManager.h ProjectSettings.cpp \ - ProjectSettings.h ProjectWindow.cpp ProjectWindow.h \ - RealFFTf.cpp RealFFTf.h RealFFTf48x.cpp RealFFTf48x.h \ - RefreshCode.h Resample.cpp Resample.h RevisionIdent.h \ - RingBuffer.cpp RingBuffer.h Screenshot.cpp Screenshot.h \ - SelectUtilities.cpp SelectUtilities.h SelectedRegion.cpp \ - SelectedRegion.h SelectionState.cpp SelectionState.h \ - Shuttle.cpp Shuttle.h ShuttleGetDefinition.cpp \ - ShuttleGetDefinition.h ShuttleGui.cpp ShuttleGui.h \ - ShuttlePrefs.cpp ShuttlePrefs.h Snap.cpp Snap.h \ + ProjectSettings.h ProjectStatus.cpp ProjectStatus.h \ + ProjectWindow.cpp ProjectWindow.h RealFFTf.cpp RealFFTf.h \ + RealFFTf48x.cpp RealFFTf48x.h RefreshCode.h Resample.cpp \ + Resample.h RevisionIdent.h RingBuffer.cpp RingBuffer.h \ + Screenshot.cpp Screenshot.h SelectUtilities.cpp \ + SelectUtilities.h SelectedRegion.cpp SelectedRegion.h \ + SelectionState.cpp SelectionState.h Shuttle.cpp Shuttle.h \ + ShuttleGetDefinition.cpp ShuttleGetDefinition.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 \ @@ -695,6 +695,7 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \ audacity-ProjectManager.$(OBJEXT) \ audacity-ProjectSelectionManager.$(OBJEXT) \ audacity-ProjectSettings.$(OBJEXT) \ + audacity-ProjectStatus.$(OBJEXT) \ audacity-ProjectWindow.$(OBJEXT) audacity-RealFFTf.$(OBJEXT) \ audacity-RealFFTf48x.$(OBJEXT) audacity-Resample.$(OBJEXT) \ audacity-RingBuffer.$(OBJEXT) audacity-Screenshot.$(OBJEXT) \ @@ -1432,15 +1433,15 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ ProjectHistory.cpp ProjectHistory.h ProjectManager.cpp \ ProjectManager.h ProjectSelectionManager.cpp \ ProjectSelectionManager.h ProjectSettings.cpp \ - ProjectSettings.h ProjectWindow.cpp ProjectWindow.h \ - RealFFTf.cpp RealFFTf.h RealFFTf48x.cpp RealFFTf48x.h \ - RefreshCode.h Resample.cpp Resample.h RevisionIdent.h \ - RingBuffer.cpp RingBuffer.h Screenshot.cpp Screenshot.h \ - SelectUtilities.cpp SelectUtilities.h SelectedRegion.cpp \ - SelectedRegion.h SelectionState.cpp SelectionState.h \ - Shuttle.cpp Shuttle.h ShuttleGetDefinition.cpp \ - ShuttleGetDefinition.h ShuttleGui.cpp ShuttleGui.h \ - ShuttlePrefs.cpp ShuttlePrefs.h Snap.cpp Snap.h \ + ProjectSettings.h ProjectStatus.cpp ProjectStatus.h \ + ProjectWindow.cpp ProjectWindow.h RealFFTf.cpp RealFFTf.h \ + RealFFTf48x.cpp RealFFTf48x.h RefreshCode.h Resample.cpp \ + Resample.h RevisionIdent.h RingBuffer.cpp RingBuffer.h \ + Screenshot.cpp Screenshot.h SelectUtilities.cpp \ + SelectUtilities.h SelectedRegion.cpp SelectedRegion.h \ + SelectionState.cpp SelectionState.h Shuttle.cpp Shuttle.h \ + ShuttleGetDefinition.cpp ShuttleGetDefinition.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 \ @@ -2647,6 +2648,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-ProjectManager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-ProjectSelectionManager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-ProjectSettings.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-ProjectStatus.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-ProjectWindow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-RealFFTf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-RealFFTf48x.Po@am__quote@ @@ -4255,6 +4257,20 @@ audacity-ProjectSettings.obj: ProjectSettings.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-ProjectSettings.obj `if test -f 'ProjectSettings.cpp'; then $(CYGPATH_W) 'ProjectSettings.cpp'; else $(CYGPATH_W) '$(srcdir)/ProjectSettings.cpp'; fi` +audacity-ProjectStatus.o: ProjectStatus.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT audacity-ProjectStatus.o -MD -MP -MF $(DEPDIR)/audacity-ProjectStatus.Tpo -c -o audacity-ProjectStatus.o `test -f 'ProjectStatus.cpp' || echo '$(srcdir)/'`ProjectStatus.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-ProjectStatus.Tpo $(DEPDIR)/audacity-ProjectStatus.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ProjectStatus.cpp' object='audacity-ProjectStatus.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-ProjectStatus.o `test -f 'ProjectStatus.cpp' || echo '$(srcdir)/'`ProjectStatus.cpp + +audacity-ProjectStatus.obj: ProjectStatus.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT audacity-ProjectStatus.obj -MD -MP -MF $(DEPDIR)/audacity-ProjectStatus.Tpo -c -o audacity-ProjectStatus.obj `if test -f 'ProjectStatus.cpp'; then $(CYGPATH_W) 'ProjectStatus.cpp'; else $(CYGPATH_W) '$(srcdir)/ProjectStatus.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-ProjectStatus.Tpo $(DEPDIR)/audacity-ProjectStatus.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ProjectStatus.cpp' object='audacity-ProjectStatus.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-ProjectStatus.obj `if test -f 'ProjectStatus.cpp'; then $(CYGPATH_W) 'ProjectStatus.cpp'; else $(CYGPATH_W) '$(srcdir)/ProjectStatus.cpp'; fi` + audacity-ProjectWindow.o: ProjectWindow.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT audacity-ProjectWindow.o -MD -MP -MF $(DEPDIR)/audacity-ProjectWindow.Tpo -c -o audacity-ProjectWindow.o `test -f 'ProjectWindow.cpp' || echo '$(srcdir)/'`ProjectWindow.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-ProjectWindow.Tpo $(DEPDIR)/audacity-ProjectWindow.Po diff --git a/src/ProjectStatus.cpp b/src/ProjectStatus.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/src/ProjectStatus.h b/src/ProjectStatus.h new file mode 100644 index 000000000..e69de29bb diff --git a/win/Projects/Audacity/Audacity.vcxproj b/win/Projects/Audacity/Audacity.vcxproj index 2b58c0d42..07704959e 100755 --- a/win/Projects/Audacity/Audacity.vcxproj +++ b/win/Projects/Audacity/Audacity.vcxproj @@ -235,6 +235,7 @@ + @@ -697,6 +698,7 @@ + diff --git a/win/Projects/Audacity/Audacity.vcxproj.filters b/win/Projects/Audacity/Audacity.vcxproj.filters index 7f09a7f69..a21757517 100755 --- a/win/Projects/Audacity/Audacity.vcxproj.filters +++ b/win/Projects/Audacity/Audacity.vcxproj.filters @@ -299,6 +299,9 @@ src + + src + src @@ -1429,6 +1432,9 @@ src + + src + src