From 24bd7cf571182b5ab9e69a624f26f56f95d84b65 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Thu, 4 Jul 2019 09:13:59 -0400 Subject: [PATCH] New files for ScrubUI --- locale/POTFILES.in | 2 ++ mac/Audacity.xcodeproj/project.pbxproj | 6 +++++ src/Makefile.am | 2 ++ src/Makefile.in | 24 +++++++++++++++++-- src/tracks/ui/ScrubUI.cpp | 0 src/tracks/ui/ScrubUI.h | 0 win/Projects/Audacity/Audacity.vcxproj | 2 ++ .../Audacity/Audacity.vcxproj.filters | 6 +++++ 8 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 src/tracks/ui/ScrubUI.cpp create mode 100644 src/tracks/ui/ScrubUI.h diff --git a/locale/POTFILES.in b/locale/POTFILES.in index 1d78ffad3..bbb22dd3d 100644 --- a/locale/POTFILES.in +++ b/locale/POTFILES.in @@ -726,6 +726,8 @@ src/tracks/ui/PlayIndicatorOverlay.cpp src/tracks/ui/PlayIndicatorOverlay.h src/tracks/ui/Scrubbing.cpp src/tracks/ui/Scrubbing.h +src/tracks/ui/ScrubUI.cpp +src/tracks/ui/ScrubUI.h src/tracks/ui/SelectHandle.cpp src/tracks/ui/SelectHandle.h src/tracks/ui/SliderHandle.cpp diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj index f0ef58201..4e145eb7e 100644 --- a/mac/Audacity.xcodeproj/project.pbxproj +++ b/mac/Audacity.xcodeproj/project.pbxproj @@ -1235,6 +1235,7 @@ 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 */; }; + 5E1B0BCF22CE3240008AA220 /* ScrubUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E1B0BCD22CE3240008AA220 /* ScrubUI.cpp */; }; 5E2A19941EED688500217B58 /* SelectionState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2A19921EED688500217B58 /* SelectionState.cpp */; }; 5E2B3E5C22BD9798005042E1 /* SelectUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2B3E5A22BD9798005042E1 /* SelectUtilities.cpp */; }; 5E2B3E5F22BD97A7005042E1 /* TrackUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2B3E5D22BD97A7005042E1 /* TrackUtilities.cpp */; }; @@ -3241,6 +3242,8 @@ 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 = ""; }; + 5E1B0BCD22CE3240008AA220 /* ScrubUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrubUI.cpp; sourceTree = ""; }; + 5E1B0BCE22CE3240008AA220 /* ScrubUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrubUI.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 = ""; }; @@ -6311,6 +6314,7 @@ 5E7396451DAFD8F200BA0A4D /* EnvelopeHandle.cpp */, 5E74D2DF1CC4429700D88B0B /* PlayIndicatorOverlay.cpp */, 5E74D2E11CC4429700D88B0B /* Scrubbing.cpp */, + 5E1B0BCD22CE3240008AA220 /* ScrubUI.cpp */, 5E73966F1DAFDB9D00BA0A4D /* SelectHandle.cpp */, 5E73964E1DAFD98400BA0A4D /* SliderHandle.cpp */, 5E7396421DAFD8C600BA0A4D /* TimeShiftHandle.cpp */, @@ -6329,6 +6333,7 @@ 5E7396461DAFD8F200BA0A4D /* EnvelopeHandle.h */, 5E74D2E01CC4429700D88B0B /* PlayIndicatorOverlay.h */, 5E74D2E21CC4429700D88B0B /* Scrubbing.h */, + 5E1B0BCE22CE3240008AA220 /* ScrubUI.h */, 5E7396701DAFDB9D00BA0A4D /* SelectHandle.h */, 5E73964F1DAFD98400BA0A4D /* SliderHandle.h */, 5E7396431DAFD8C600BA0A4D /* TimeShiftHandle.h */, @@ -8610,6 +8615,7 @@ 1841B50B0E00AD6E00F386E9 /* ODManager.cpp in Sources */, 5E15123D1DB000C000702E29 /* UIHandle.cpp in Sources */, 1841B50C0E00AD6E00F386E9 /* ODTask.cpp in Sources */, + 5E1B0BCF22CE3240008AA220 /* ScrubUI.cpp in Sources */, 1841B50D0E00AD6E00F386E9 /* ODTaskThread.cpp in Sources */, 5E74D2E51CC4429700D88B0B /* Scrubbing.cpp in Sources */, 1841B50E0E00AD6E00F386E9 /* ODWaveTrackTaskQueue.cpp in Sources */, diff --git a/src/Makefile.am b/src/Makefile.am index 28b7f7d96..c536a52f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -708,6 +708,8 @@ audacity_SOURCES = \ tracks/ui/PlayIndicatorOverlay.h \ tracks/ui/Scrubbing.cpp \ tracks/ui/Scrubbing.h \ + tracks/ui/ScrubUI.cpp \ + tracks/ui/ScrubUI.h \ tracks/ui/SelectHandle.cpp \ tracks/ui/SelectHandle.h \ tracks/ui/SliderHandle.cpp \ diff --git a/src/Makefile.in b/src/Makefile.in index ebe29c0a3..20beeecf7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -559,7 +559,8 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ tracks/ui/EditCursorOverlay.h tracks/ui/EnvelopeHandle.cpp \ tracks/ui/EnvelopeHandle.h tracks/ui/PlayIndicatorOverlay.cpp \ tracks/ui/PlayIndicatorOverlay.h tracks/ui/Scrubbing.cpp \ - tracks/ui/Scrubbing.h tracks/ui/SelectHandle.cpp \ + tracks/ui/Scrubbing.h tracks/ui/ScrubUI.cpp \ + tracks/ui/ScrubUI.h tracks/ui/SelectHandle.cpp \ tracks/ui/SelectHandle.h tracks/ui/SliderHandle.cpp \ tracks/ui/SliderHandle.h tracks/ui/TimeShiftHandle.cpp \ tracks/ui/TimeShiftHandle.h tracks/ui/TrackButtonHandles.cpp \ @@ -913,6 +914,7 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \ tracks/ui/audacity-EnvelopeHandle.$(OBJEXT) \ tracks/ui/audacity-PlayIndicatorOverlay.$(OBJEXT) \ tracks/ui/audacity-Scrubbing.$(OBJEXT) \ + tracks/ui/audacity-ScrubUI.$(OBJEXT) \ tracks/ui/audacity-SelectHandle.$(OBJEXT) \ tracks/ui/audacity-SliderHandle.$(OBJEXT) \ tracks/ui/audacity-TimeShiftHandle.$(OBJEXT) \ @@ -1665,7 +1667,8 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ tracks/ui/EditCursorOverlay.h tracks/ui/EnvelopeHandle.cpp \ tracks/ui/EnvelopeHandle.h tracks/ui/PlayIndicatorOverlay.cpp \ tracks/ui/PlayIndicatorOverlay.h tracks/ui/Scrubbing.cpp \ - tracks/ui/Scrubbing.h tracks/ui/SelectHandle.cpp \ + tracks/ui/Scrubbing.h tracks/ui/ScrubUI.cpp \ + tracks/ui/ScrubUI.h tracks/ui/SelectHandle.cpp \ tracks/ui/SelectHandle.h tracks/ui/SliderHandle.cpp \ tracks/ui/SliderHandle.h tracks/ui/TimeShiftHandle.cpp \ tracks/ui/TimeShiftHandle.h tracks/ui/TrackButtonHandles.cpp \ @@ -2379,6 +2382,8 @@ tracks/ui/audacity-PlayIndicatorOverlay.$(OBJEXT): \ tracks/ui/$(am__dirstamp) tracks/ui/$(DEPDIR)/$(am__dirstamp) tracks/ui/audacity-Scrubbing.$(OBJEXT): tracks/ui/$(am__dirstamp) \ tracks/ui/$(DEPDIR)/$(am__dirstamp) +tracks/ui/audacity-ScrubUI.$(OBJEXT): tracks/ui/$(am__dirstamp) \ + tracks/ui/$(DEPDIR)/$(am__dirstamp) tracks/ui/audacity-SelectHandle.$(OBJEXT): tracks/ui/$(am__dirstamp) \ tracks/ui/$(DEPDIR)/$(am__dirstamp) tracks/ui/audacity-SliderHandle.$(OBJEXT): tracks/ui/$(am__dirstamp) \ @@ -2923,6 +2928,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-EditCursorOverlay.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-EnvelopeHandle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-PlayIndicatorOverlay.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-ScrubUI.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-Scrubbing.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-SelectHandle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-SliderHandle.Po@am__quote@ @@ -7519,6 +7525,20 @@ tracks/ui/audacity-Scrubbing.obj: tracks/ui/Scrubbing.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 tracks/ui/audacity-Scrubbing.obj `if test -f 'tracks/ui/Scrubbing.cpp'; then $(CYGPATH_W) 'tracks/ui/Scrubbing.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/ui/Scrubbing.cpp'; fi` +tracks/ui/audacity-ScrubUI.o: tracks/ui/ScrubUI.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/ui/audacity-ScrubUI.o -MD -MP -MF tracks/ui/$(DEPDIR)/audacity-ScrubUI.Tpo -c -o tracks/ui/audacity-ScrubUI.o `test -f 'tracks/ui/ScrubUI.cpp' || echo '$(srcdir)/'`tracks/ui/ScrubUI.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/ui/$(DEPDIR)/audacity-ScrubUI.Tpo tracks/ui/$(DEPDIR)/audacity-ScrubUI.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/ui/ScrubUI.cpp' object='tracks/ui/audacity-ScrubUI.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 tracks/ui/audacity-ScrubUI.o `test -f 'tracks/ui/ScrubUI.cpp' || echo '$(srcdir)/'`tracks/ui/ScrubUI.cpp + +tracks/ui/audacity-ScrubUI.obj: tracks/ui/ScrubUI.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/ui/audacity-ScrubUI.obj -MD -MP -MF tracks/ui/$(DEPDIR)/audacity-ScrubUI.Tpo -c -o tracks/ui/audacity-ScrubUI.obj `if test -f 'tracks/ui/ScrubUI.cpp'; then $(CYGPATH_W) 'tracks/ui/ScrubUI.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/ui/ScrubUI.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/ui/$(DEPDIR)/audacity-ScrubUI.Tpo tracks/ui/$(DEPDIR)/audacity-ScrubUI.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/ui/ScrubUI.cpp' object='tracks/ui/audacity-ScrubUI.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 tracks/ui/audacity-ScrubUI.obj `if test -f 'tracks/ui/ScrubUI.cpp'; then $(CYGPATH_W) 'tracks/ui/ScrubUI.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/ui/ScrubUI.cpp'; fi` + tracks/ui/audacity-SelectHandle.o: tracks/ui/SelectHandle.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/ui/audacity-SelectHandle.o -MD -MP -MF tracks/ui/$(DEPDIR)/audacity-SelectHandle.Tpo -c -o tracks/ui/audacity-SelectHandle.o `test -f 'tracks/ui/SelectHandle.cpp' || echo '$(srcdir)/'`tracks/ui/SelectHandle.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/ui/$(DEPDIR)/audacity-SelectHandle.Tpo tracks/ui/$(DEPDIR)/audacity-SelectHandle.Po diff --git a/src/tracks/ui/ScrubUI.cpp b/src/tracks/ui/ScrubUI.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/src/tracks/ui/ScrubUI.h b/src/tracks/ui/ScrubUI.h new file mode 100644 index 000000000..e69de29bb diff --git a/win/Projects/Audacity/Audacity.vcxproj b/win/Projects/Audacity/Audacity.vcxproj index 07704959e..505054749 100755 --- a/win/Projects/Audacity/Audacity.vcxproj +++ b/win/Projects/Audacity/Audacity.vcxproj @@ -311,6 +311,7 @@ + @@ -625,6 +626,7 @@ + diff --git a/win/Projects/Audacity/Audacity.vcxproj.filters b/win/Projects/Audacity/Audacity.vcxproj.filters index a21757517..c9fe63d06 100755 --- a/win/Projects/Audacity/Audacity.vcxproj.filters +++ b/win/Projects/Audacity/Audacity.vcxproj.filters @@ -929,6 +929,9 @@ src\tracks\ui + + src\tracks\ui + src @@ -2125,6 +2128,9 @@ src\tracks\ui + + src\tracks\ui + src\commands