Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-17 16:50:26 +02:00
Code Issues Releases Wiki Activity

New files for ScrubUI

Browse Source
This commit is contained in:
Paul Licameli 2019-07-04 09:13:59 -04:00
parent 8c59b6f1cf
commit 24bd7cf571
8 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
locale/POTFILES.in
View File

@ -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

6
mac/Audacity.xcodeproj/project.pbxproj
View File

@ -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 = "<group>"; };
5E1B0BCA22CBA4F3008AA220 /* ProjectStatus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectStatus.cpp; sourceTree = "<group>"; };
5E1B0BCB22CBA4F3008AA220 /* ProjectStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectStatus.h; sourceTree = "<group>"; };
5E1B0BCD22CE3240008AA220 /* ScrubUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrubUI.cpp; sourceTree = "<group>"; };
5E1B0BCE22CE3240008AA220 /* ScrubUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrubUI.h; sourceTree = "<group>"; };
5E1C3F4D218F7604002CD087 /* TrackPanelDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackPanelDrawable.h; sourceTree = "<group>"; };
5E2A19921EED688500217B58 /* SelectionState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectionState.cpp; sourceTree = "<group>"; };
5E2A19931EED688500217B58 /* SelectionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectionState.h; sourceTree = "<group>"; };
@ -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 */,

2
src/Makefile.am
View File

@ -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 \

24
src/Makefile.in
View File

@ -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

0
src/tracks/ui/ScrubUI.cpp Normal file
View File

0
src/tracks/ui/ScrubUI.h Normal file
View File

2
win/Projects/Audacity/Audacity.vcxproj
View File

@ -311,6 +311,7 @@
<ClCompile Include="..\..\..\src\tracks\ui\EnvelopeHandle.cpp" />
<ClCompile Include="..\..\..\src\tracks\ui\PlayIndicatorOverlay.cpp" />
<ClCompile Include="..\..\..\src\tracks\ui\Scrubbing.cpp" />
<ClCompile Include="..\..\..\src\tracks\ui\ScrubUI.cpp" />
<ClCompile Include="..\..\..\src\tracks\ui\SelectHandle.cpp" />
<ClCompile Include="..\..\..\src\tracks\ui\SliderHandle.cpp" />
<ClCompile Include="..\..\..\src\tracks\ui\TimeShiftHandle.cpp" />
@ -625,6 +626,7 @@
<ClInclude Include="..\..\..\src\tracks\ui\EnvelopeHandle.h" />
<ClInclude Include="..\..\..\src\tracks\ui\PlayIndicatorOverlay.h" />
<ClInclude Include="..\..\..\src\tracks\ui\Scrubbing.h" />
<ClInclude Include="..\..\..\src\tracks\ui\ScrubUI.h" />
<ClInclude Include="..\..\..\src\tracks\ui\TrackView.h" />
<ClInclude Include="..\..\..\src\TranslatableStringArray.h" />
<ClInclude Include="..\..\..\src\UserException.h" />

6
win/Projects/Audacity/Audacity.vcxproj.filters
View File

@ -929,6 +929,9 @@
<ClCompile Include="..\..\..\src\tracks\ui\Scrubbing.cpp">
<Filter>src\tracks\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\ui\ScrubUI.cpp">
<Filter>src\tracks\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\TrackPanel.cpp">
<Filter>src</Filter>
</ClCompile>
@ -2125,6 +2128,9 @@
<ClInclude Include="..\..\..\src\tracks\ui\Scrubbing.h">
<Filter>src\tracks\ui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tracks\ui\ScrubUI.h">
<Filter>src\tracks\ui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\commands\CommandFunctors.h">
<Filter>src\commands</Filter>
</ClInclude>