diff --git a/locale/POTFILES.in b/locale/POTFILES.in index abdeea7e4..e44e5591e 100644 --- a/locale/POTFILES.in +++ b/locale/POTFILES.in @@ -674,6 +674,8 @@ src/tracks/playabletrack/notetrack/ui/StretchHandle.cpp src/tracks/playabletrack/notetrack/ui/StretchHandle.h src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp src/tracks/playabletrack/ui/PlayableTrackButtonHandles.h +src/tracks/playabletrack/ui/PlayableTrackControls.cpp +src/tracks/playabletrack/ui/PlayableTrackControls.h src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj index c6ab756a7..599fa4263 100644 --- a/mac/Audacity.xcodeproj/project.pbxproj +++ b/mac/Audacity.xcodeproj/project.pbxproj @@ -1291,6 +1291,7 @@ 5EC4257222B92383005E8AB5 /* CommonTrackControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EC4256E22B92383005E8AB5 /* CommonTrackControls.cpp */; }; 5EC4257322B92383005E8AB5 /* CommonTrackView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EC4257022B92383005E8AB5 /* CommonTrackView.cpp */; }; 5EC4257922BA7CF2005E8AB5 /* ZoomInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EC4257722BA7CF2005E8AB5 /* ZoomInfo.cpp */; }; + 5EC4257C22BAC86E005E8AB5 /* PlayableTrackControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EC4257A22BAC86E005E8AB5 /* PlayableTrackControls.cpp */; }; 5EC7ED061E101C5C0052CAE2 /* NotYetAvailableException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EC7ED041E101C5C0052CAE2 /* NotYetAvailableException.cpp */; }; 5ECF728722871A4F007F2A35 /* ShuttleGetDefinition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5ECF728522871A4F007F2A35 /* ShuttleGetDefinition.cpp */; }; 5ECF728A22887B3B007F2A35 /* MissingAliasFileDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5ECF728822887B3B007F2A35 /* MissingAliasFileDialog.cpp */; }; @@ -3343,6 +3344,8 @@ 5EC4257122B92383005E8AB5 /* CommonTrackView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonTrackView.h; sourceTree = ""; }; 5EC4257722BA7CF2005E8AB5 /* ZoomInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZoomInfo.cpp; sourceTree = ""; }; 5EC4257822BA7CF2005E8AB5 /* ZoomInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZoomInfo.h; sourceTree = ""; }; + 5EC4257A22BAC86E005E8AB5 /* PlayableTrackControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayableTrackControls.cpp; sourceTree = ""; }; + 5EC4257B22BAC86E005E8AB5 /* PlayableTrackControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayableTrackControls.h; sourceTree = ""; }; 5EC7ED041E101C5C0052CAE2 /* NotYetAvailableException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NotYetAvailableException.cpp; sourceTree = ""; }; 5EC7ED051E101C5C0052CAE2 /* NotYetAvailableException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotYetAvailableException.h; sourceTree = ""; }; 5ECCE7651DE49834009900E9 /* AudacityException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudacityException.h; sourceTree = ""; }; @@ -6182,7 +6185,9 @@ isa = PBXGroup; children = ( 5E10D9041EC8F81300B3AC57 /* PlayableTrackButtonHandles.cpp */, + 5EC4257A22BAC86E005E8AB5 /* PlayableTrackControls.cpp */, 5E10D9051EC8F81300B3AC57 /* PlayableTrackButtonHandles.h */, + 5EC4257B22BAC86E005E8AB5 /* PlayableTrackControls.h */, ); path = ui; sourceTree = ""; @@ -8622,6 +8627,7 @@ 28D540080FD1912A00FA7C75 /* ScriptCommandRelay.cpp in Sources */, 5E73963E1DAFD86000BA0A4D /* ZoomHandle.cpp in Sources */, 28DB34790FDC2C5D0011F589 /* ResponseQueue.cpp in Sources */, + 5EC4257C22BAC86E005E8AB5 /* PlayableTrackControls.cpp in Sources */, 28DABFBE0FF19DB100AC7848 /* RealFFTf.cpp in Sources */, 2800FE370FF32566005CA9E5 /* MidiIOPrefs.cpp in Sources */, 5EA0182B1EC7B226001F2996 /* WaveTrackControls.cpp in Sources */, diff --git a/src/Makefile.am b/src/Makefile.am index 62782dd24..1e5cf1b54 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -656,6 +656,8 @@ audacity_SOURCES = \ tracks/playabletrack/notetrack/ui/StretchHandle.h \ tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp \ tracks/playabletrack/ui/PlayableTrackButtonHandles.h \ + tracks/playabletrack/ui/PlayableTrackControls.cpp \ + tracks/playabletrack/ui/PlayableTrackControls.h \ tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp \ tracks/playabletrack/wavetrack/ui/CutlineHandle.h \ tracks/playabletrack/wavetrack/ui/SampleHandle.cpp \ diff --git a/src/Makefile.in b/src/Makefile.in index 7f2f80acc..7bdf3f96d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -520,6 +520,8 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ tracks/playabletrack/notetrack/ui/StretchHandle.h \ tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp \ tracks/playabletrack/ui/PlayableTrackButtonHandles.h \ + tracks/playabletrack/ui/PlayableTrackControls.cpp \ + tracks/playabletrack/ui/PlayableTrackControls.h \ tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp \ tracks/playabletrack/wavetrack/ui/CutlineHandle.h \ tracks/playabletrack/wavetrack/ui/SampleHandle.cpp \ @@ -879,6 +881,7 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \ tracks/playabletrack/notetrack/ui/audacity-NoteTrackVZoomHandle.$(OBJEXT) \ tracks/playabletrack/notetrack/ui/audacity-StretchHandle.$(OBJEXT) \ tracks/playabletrack/ui/audacity-PlayableTrackButtonHandles.$(OBJEXT) \ + tracks/playabletrack/ui/audacity-PlayableTrackControls.$(OBJEXT) \ tracks/playabletrack/wavetrack/ui/audacity-CutlineHandle.$(OBJEXT) \ tracks/playabletrack/wavetrack/ui/audacity-SampleHandle.$(OBJEXT) \ tracks/playabletrack/wavetrack/ui/audacity-WaveTrackControls.$(OBJEXT) \ @@ -1611,6 +1614,8 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ tracks/playabletrack/notetrack/ui/StretchHandle.h \ tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp \ tracks/playabletrack/ui/PlayableTrackButtonHandles.h \ + tracks/playabletrack/ui/PlayableTrackControls.cpp \ + tracks/playabletrack/ui/PlayableTrackControls.h \ tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp \ tracks/playabletrack/wavetrack/ui/CutlineHandle.h \ tracks/playabletrack/wavetrack/ui/SampleHandle.cpp \ @@ -2281,6 +2286,9 @@ tracks/playabletrack/ui/$(DEPDIR)/$(am__dirstamp): tracks/playabletrack/ui/audacity-PlayableTrackButtonHandles.$(OBJEXT): \ tracks/playabletrack/ui/$(am__dirstamp) \ tracks/playabletrack/ui/$(DEPDIR)/$(am__dirstamp) +tracks/playabletrack/ui/audacity-PlayableTrackControls.$(OBJEXT): \ + tracks/playabletrack/ui/$(am__dirstamp) \ + tracks/playabletrack/ui/$(DEPDIR)/$(am__dirstamp) tracks/playabletrack/wavetrack/ui/$(am__dirstamp): @$(MKDIR_P) tracks/playabletrack/wavetrack/ui @: > tracks/playabletrack/wavetrack/ui/$(am__dirstamp) @@ -2867,6 +2875,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackView.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-StretchHandle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/ui/$(DEPDIR)/audacity-PlayableTrackButtonHandles.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/ui/$(DEPDIR)/audacity-PlayableTrackControls.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-CutlineHandle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-SampleHandle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackControls.Po@am__quote@ @@ -7131,6 +7140,20 @@ tracks/playabletrack/ui/audacity-PlayableTrackButtonHandles.obj: tracks/playable @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/playabletrack/ui/audacity-PlayableTrackButtonHandles.obj `if test -f 'tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp'; then $(CYGPATH_W) 'tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp'; fi` +tracks/playabletrack/ui/audacity-PlayableTrackControls.o: tracks/playabletrack/ui/PlayableTrackControls.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/playabletrack/ui/audacity-PlayableTrackControls.o -MD -MP -MF tracks/playabletrack/ui/$(DEPDIR)/audacity-PlayableTrackControls.Tpo -c -o tracks/playabletrack/ui/audacity-PlayableTrackControls.o `test -f 'tracks/playabletrack/ui/PlayableTrackControls.cpp' || echo '$(srcdir)/'`tracks/playabletrack/ui/PlayableTrackControls.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/playabletrack/ui/$(DEPDIR)/audacity-PlayableTrackControls.Tpo tracks/playabletrack/ui/$(DEPDIR)/audacity-PlayableTrackControls.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/playabletrack/ui/PlayableTrackControls.cpp' object='tracks/playabletrack/ui/audacity-PlayableTrackControls.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/playabletrack/ui/audacity-PlayableTrackControls.o `test -f 'tracks/playabletrack/ui/PlayableTrackControls.cpp' || echo '$(srcdir)/'`tracks/playabletrack/ui/PlayableTrackControls.cpp + +tracks/playabletrack/ui/audacity-PlayableTrackControls.obj: tracks/playabletrack/ui/PlayableTrackControls.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/playabletrack/ui/audacity-PlayableTrackControls.obj -MD -MP -MF tracks/playabletrack/ui/$(DEPDIR)/audacity-PlayableTrackControls.Tpo -c -o tracks/playabletrack/ui/audacity-PlayableTrackControls.obj `if test -f 'tracks/playabletrack/ui/PlayableTrackControls.cpp'; then $(CYGPATH_W) 'tracks/playabletrack/ui/PlayableTrackControls.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/playabletrack/ui/PlayableTrackControls.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/playabletrack/ui/$(DEPDIR)/audacity-PlayableTrackControls.Tpo tracks/playabletrack/ui/$(DEPDIR)/audacity-PlayableTrackControls.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/playabletrack/ui/PlayableTrackControls.cpp' object='tracks/playabletrack/ui/audacity-PlayableTrackControls.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/playabletrack/ui/audacity-PlayableTrackControls.obj `if test -f 'tracks/playabletrack/ui/PlayableTrackControls.cpp'; then $(CYGPATH_W) 'tracks/playabletrack/ui/PlayableTrackControls.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/playabletrack/ui/PlayableTrackControls.cpp'; fi` + tracks/playabletrack/wavetrack/ui/audacity-CutlineHandle.o: tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/playabletrack/wavetrack/ui/audacity-CutlineHandle.o -MD -MP -MF tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-CutlineHandle.Tpo -c -o tracks/playabletrack/wavetrack/ui/audacity-CutlineHandle.o `test -f 'tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp' || echo '$(srcdir)/'`tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-CutlineHandle.Tpo tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-CutlineHandle.Po diff --git a/src/tracks/playabletrack/ui/PlayableTrackControls.cpp b/src/tracks/playabletrack/ui/PlayableTrackControls.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/src/tracks/playabletrack/ui/PlayableTrackControls.h b/src/tracks/playabletrack/ui/PlayableTrackControls.h new file mode 100644 index 000000000..e69de29bb diff --git a/win/Projects/Audacity/Audacity.vcxproj b/win/Projects/Audacity/Audacity.vcxproj index e3d032f3b..8f90ed532 100755 --- a/win/Projects/Audacity/Audacity.vcxproj +++ b/win/Projects/Audacity/Audacity.vcxproj @@ -287,6 +287,7 @@ + @@ -587,6 +588,7 @@ + diff --git a/win/Projects/Audacity/Audacity.vcxproj.filters b/win/Projects/Audacity/Audacity.vcxproj.filters index 09287434e..f93d9ba46 100755 --- a/win/Projects/Audacity/Audacity.vcxproj.filters +++ b/win/Projects/Audacity/Audacity.vcxproj.filters @@ -1040,6 +1040,9 @@ src\tracks\playabletrack\ui + + src\tracks\playabletrack\ui + src\tracks\playabletrack\wavetrack\ui @@ -2230,6 +2233,9 @@ src\tracks\playabletrack\ui + + src\tracks\playabletrack\ui + src\tracks\playabletrack\wavetrack\ui