From d7753f7acda857eb5f7310f37b6e623a92d99b6d Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Fri, 7 Dec 2018 17:12:36 -0500 Subject: [PATCH] Rename old .cpp files, add new .h files --- locale/POTFILES.in | 15 +- mac/Audacity.xcodeproj/project.pbxproj | 50 +++-- src/Makefile.am | 15 +- src/Makefile.in | 174 +++++++++--------- .../{LabelTrackUI.cpp => LabelTrackView.cpp} | 2 +- src/tracks/labeltrack/ui/LabelTrackView.h | 0 .../ui/{NoteTrackUI.cpp => NoteTrackView.cpp} | 2 +- .../notetrack/ui/NoteTrackView.h | 0 .../ui/{WaveTrackUI.cpp => WaveTrackView.cpp} | 2 +- .../wavetrack/ui/WaveTrackView.h | 0 .../ui/{TimeTrackUI.cpp => TimeTrackView.cpp} | 2 +- src/tracks/timetrack/ui/TimeTrackView.h | 0 src/tracks/ui/{TrackUI.cpp => TrackView.cpp} | 2 +- src/tracks/ui/TrackView.h | 0 win/Projects/Audacity/Audacity.vcxproj | 15 +- .../Audacity/Audacity.vcxproj.filters | 45 +++-- 16 files changed, 186 insertions(+), 138 deletions(-) rename src/tracks/labeltrack/ui/{LabelTrackUI.cpp => LabelTrackView.cpp} (98%) create mode 100644 src/tracks/labeltrack/ui/LabelTrackView.h rename src/tracks/playabletrack/notetrack/ui/{NoteTrackUI.cpp => NoteTrackView.cpp} (98%) create mode 100644 src/tracks/playabletrack/notetrack/ui/NoteTrackView.h rename src/tracks/playabletrack/wavetrack/ui/{WaveTrackUI.cpp => WaveTrackView.cpp} (99%) create mode 100644 src/tracks/playabletrack/wavetrack/ui/WaveTrackView.h rename src/tracks/timetrack/ui/{TimeTrackUI.cpp => TimeTrackView.cpp} (98%) create mode 100644 src/tracks/timetrack/ui/TimeTrackView.h rename src/tracks/ui/{TrackUI.cpp => TrackView.cpp} (99%) create mode 100644 src/tracks/ui/TrackView.h diff --git a/locale/POTFILES.in b/locale/POTFILES.in index 912f13194..f822ebb5f 100644 --- a/locale/POTFILES.in +++ b/locale/POTFILES.in @@ -650,7 +650,8 @@ src/tracks/labeltrack/ui/LabelTextHandle.cpp src/tracks/labeltrack/ui/LabelTextHandle.h src/tracks/labeltrack/ui/LabelTrackControls.cpp src/tracks/labeltrack/ui/LabelTrackControls.h -src/tracks/labeltrack/ui/LabelTrackUI.cpp +src/tracks/labeltrack/ui/LabelTrackView.cpp +src/tracks/labeltrack/ui/LabelTrackView.h src/tracks/labeltrack/ui/LabelTrackVRulerControls.cpp src/tracks/labeltrack/ui/LabelTrackVRulerControls.h src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp @@ -659,7 +660,8 @@ src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.h -src/tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp +src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp +src/tracks/playabletrack/notetrack/ui/NoteTrackView.h src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.h src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp @@ -676,14 +678,16 @@ src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.h src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.h -src/tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp +src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp +src/tracks/playabletrack/wavetrack/ui/WaveTrackView.h src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.h src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h src/tracks/timetrack/ui/TimeTrackControls.cpp src/tracks/timetrack/ui/TimeTrackControls.h -src/tracks/timetrack/ui/TimeTrackUI.cpp +src/tracks/timetrack/ui/TimeTrackView.cpp +src/tracks/timetrack/ui/TimeTrackView.h src/tracks/timetrack/ui/TimeTrackVRulerControls.cpp src/tracks/timetrack/ui/TimeTrackVRulerControls.h src/tracks/ui/BackgroundCell.cpp @@ -712,7 +716,8 @@ src/tracks/ui/TrackControls.cpp src/tracks/ui/TrackControls.h src/tracks/ui/TrackSelectHandle.cpp src/tracks/ui/TrackSelectHandle.h -src/tracks/ui/TrackUI.cpp +src/tracks/ui/TrackView.cpp +src/tracks/ui/TrackView.h src/tracks/ui/TrackVRulerControls.cpp src/tracks/ui/TrackVRulerControls.h src/tracks/ui/ZoomHandle.cpp diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj index df5d46fdc..03c676bdd 100644 --- a/mac/Audacity.xcodeproj/project.pbxproj +++ b/mac/Audacity.xcodeproj/project.pbxproj @@ -1221,14 +1221,11 @@ 5E135A5122A93DC60076E983 /* ProjectAudioManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E135A4F22A93DC60076E983 /* ProjectAudioManager.cpp */; }; 5E15123D1DB000C000702E29 /* UIHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E15123B1DB000C000702E29 /* UIHandle.cpp */; }; 5E15125A1DB000DC00702E29 /* LabelTrackControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E1512401DB000DC00702E29 /* LabelTrackControls.cpp */; }; - 5E15125B1DB000DC00702E29 /* LabelTrackUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E1512421DB000DC00702E29 /* LabelTrackUI.cpp */; }; 5E15125C1DB000DC00702E29 /* LabelTrackVRulerControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E1512431DB000DC00702E29 /* LabelTrackVRulerControls.cpp */; }; 5E1512601DB000DC00702E29 /* TimeTrackControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E15124E1DB000DC00702E29 /* TimeTrackControls.cpp */; }; - 5E1512611DB000DC00702E29 /* TimeTrackUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E1512501DB000DC00702E29 /* TimeTrackUI.cpp */; }; 5E1512621DB000DC00702E29 /* TimeTrackVRulerControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E1512511DB000DC00702E29 /* TimeTrackVRulerControls.cpp */; }; 5E15126D1DB0010C00702E29 /* CommonTrackPanelCell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E1512661DB0010C00702E29 /* CommonTrackPanelCell.cpp */; }; 5E15126E1DB0010C00702E29 /* TrackControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E1512681DB0010C00702E29 /* TrackControls.cpp */; }; - 5E15126F1DB0010C00702E29 /* TrackUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E15126A1DB0010C00702E29 /* TrackUI.cpp */; }; 5E1512701DB0010C00702E29 /* TrackVRulerControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E15126B1DB0010C00702E29 /* TrackVRulerControls.cpp */; }; 5E15A9AF22B3F7710007CC43 /* CommonCommandFlags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E15A9AD22B3F7710007CC43 /* CommonCommandFlags.cpp */; }; 5E16FF4D1FF9CE0B0085E1B8 /* LanguageNames.txt in Resources */ = {isa = PBXBuildFile; fileRef = 5E16FF4C1FF9CE0B0085E1B8 /* LanguageNames.txt */; }; @@ -1238,6 +1235,11 @@ 5E19D655217D51190024D0B1 /* PluginMenus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E19D64C217D51190024D0B1 /* PluginMenus.cpp */; }; 5E19F59922A9665500E3F88E /* AutoRecoveryDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E19F59722A9665500E3F88E /* AutoRecoveryDialog.cpp */; }; 5E2A19941EED688500217B58 /* SelectionState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2A19921EED688500217B58 /* SelectionState.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 */; }; + 5E2BF38E2193A30000995694 /* NoteTrackView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2BF38C2193A30000995694 /* NoteTrackView.cpp */; }; + 5E2BF3912193A31A00995694 /* LabelTrackView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2BF38F2193A31A00995694 /* LabelTrackView.cpp */; }; 5E36A0A8217FA2430068E082 /* EditMenus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E36A09F217FA2430068E082 /* EditMenus.cpp */; }; 5E36A0A9217FA2430068E082 /* ExtraMenus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E36A0A0217FA2430068E082 /* ExtraMenus.cpp */; }; 5E36A0AA217FA2430068E082 /* FileMenus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E36A0A1217FA2430068E082 /* FileMenus.cpp */; }; @@ -1280,10 +1282,8 @@ 5E89EEEA1F78D017000F5E82 /* zh_CN.po in Sources */ = {isa = PBXBuildFile; fileRef = 5E89EEE91F78D017000F5E82 /* zh_CN.po */; }; 5E94A1BA1D1F1C8400A8713A /* wxPanelWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E94A1B81D1F1C8400A8713A /* wxPanelWrapper.cpp */; }; 5EA018281EC7B226001F2996 /* NoteTrackControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EA0181C1EC7B226001F2996 /* NoteTrackControls.cpp */; }; - 5EA018291EC7B226001F2996 /* NoteTrackUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EA0181E1EC7B226001F2996 /* NoteTrackUI.cpp */; }; 5EA0182A1EC7B226001F2996 /* NoteTrackVRulerControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EA0181F1EC7B226001F2996 /* NoteTrackVRulerControls.cpp */; }; 5EA0182B1EC7B226001F2996 /* WaveTrackControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EA018231EC7B226001F2996 /* WaveTrackControls.cpp */; }; - 5EA0182C1EC7B226001F2996 /* WaveTrackUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EA018251EC7B226001F2996 /* WaveTrackUI.cpp */; }; 5EA0182D1EC7B226001F2996 /* WaveTrackVRulerControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EA018261EC7B226001F2996 /* WaveTrackVRulerControls.cpp */; }; 5EB15A2022A94043009FEC89 /* ProjectHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EB15A1E22A94043009FEC89 /* ProjectHistory.cpp */; }; 5EBD243D1F74C50800132E0A /* eu_ES.po in Sources */ = {isa = PBXBuildFile; fileRef = 5EBD243C1F74C50800132E0A /* eu_ES.po */; }; @@ -3205,19 +3205,16 @@ 5E15123C1DB000C000702E29 /* UIHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIHandle.h; sourceTree = ""; }; 5E1512401DB000DC00702E29 /* LabelTrackControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LabelTrackControls.cpp; sourceTree = ""; }; 5E1512411DB000DC00702E29 /* LabelTrackControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelTrackControls.h; sourceTree = ""; }; - 5E1512421DB000DC00702E29 /* LabelTrackUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LabelTrackUI.cpp; sourceTree = ""; }; 5E1512431DB000DC00702E29 /* LabelTrackVRulerControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LabelTrackVRulerControls.cpp; sourceTree = ""; }; 5E1512441DB000DC00702E29 /* LabelTrackVRulerControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelTrackVRulerControls.h; sourceTree = ""; }; 5E15124E1DB000DC00702E29 /* TimeTrackControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimeTrackControls.cpp; sourceTree = ""; }; 5E15124F1DB000DC00702E29 /* TimeTrackControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeTrackControls.h; sourceTree = ""; }; - 5E1512501DB000DC00702E29 /* TimeTrackUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimeTrackUI.cpp; sourceTree = ""; }; 5E1512511DB000DC00702E29 /* TimeTrackVRulerControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimeTrackVRulerControls.cpp; sourceTree = ""; }; 5E1512521DB000DC00702E29 /* TimeTrackVRulerControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeTrackVRulerControls.h; sourceTree = ""; }; 5E1512661DB0010C00702E29 /* CommonTrackPanelCell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommonTrackPanelCell.cpp; sourceTree = ""; }; 5E1512671DB0010C00702E29 /* CommonTrackPanelCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonTrackPanelCell.h; sourceTree = ""; }; 5E1512681DB0010C00702E29 /* TrackControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrackControls.cpp; sourceTree = ""; }; 5E1512691DB0010C00702E29 /* TrackControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackControls.h; sourceTree = ""; }; - 5E15126A1DB0010C00702E29 /* TrackUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrackUI.cpp; sourceTree = ""; }; 5E15126B1DB0010C00702E29 /* TrackVRulerControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrackVRulerControls.cpp; sourceTree = ""; }; 5E15126C1DB0010C00702E29 /* TrackVRulerControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackVRulerControls.h; sourceTree = ""; }; 5E15A9AD22B3F7710007CC43 /* CommonCommandFlags.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommonCommandFlags.cpp; sourceTree = ""; }; @@ -3234,6 +3231,16 @@ 5E19F59822A9665500E3F88E /* AutoRecoveryDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoRecoveryDialog.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 = ""; }; + 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 = ""; }; + 5E2BF3872193A2BD00995694 /* TimeTrackView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeTrackView.h; sourceTree = ""; }; + 5E2BF3892193A2E400995694 /* WaveTrackView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WaveTrackView.cpp; sourceTree = ""; }; + 5E2BF38A2193A2E400995694 /* WaveTrackView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WaveTrackView.h; sourceTree = ""; }; + 5E2BF38C2193A30000995694 /* NoteTrackView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NoteTrackView.cpp; sourceTree = ""; }; + 5E2BF38D2193A30000995694 /* NoteTrackView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoteTrackView.h; sourceTree = ""; }; + 5E2BF38F2193A31A00995694 /* LabelTrackView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LabelTrackView.cpp; sourceTree = ""; }; + 5E2BF3902193A31A00995694 /* LabelTrackView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelTrackView.h; sourceTree = ""; }; 5E36A09F217FA2430068E082 /* EditMenus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EditMenus.cpp; path = menus/EditMenus.cpp; sourceTree = ""; }; 5E36A0A0217FA2430068E082 /* ExtraMenus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ExtraMenus.cpp; path = menus/ExtraMenus.cpp; sourceTree = ""; }; 5E36A0A1217FA2430068E082 /* FileMenus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileMenus.cpp; path = menus/FileMenus.cpp; sourceTree = ""; }; @@ -3315,12 +3322,10 @@ 5E9985D0218D0A7D00278D81 /* ComponentInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ComponentInterface.h; path = ../include/audacity/ComponentInterface.h; sourceTree = ""; }; 5EA0181C1EC7B226001F2996 /* NoteTrackControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NoteTrackControls.cpp; sourceTree = ""; }; 5EA0181D1EC7B226001F2996 /* NoteTrackControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoteTrackControls.h; sourceTree = ""; }; - 5EA0181E1EC7B226001F2996 /* NoteTrackUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NoteTrackUI.cpp; sourceTree = ""; }; 5EA0181F1EC7B226001F2996 /* NoteTrackVRulerControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NoteTrackVRulerControls.cpp; sourceTree = ""; }; 5EA018201EC7B226001F2996 /* NoteTrackVRulerControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoteTrackVRulerControls.h; sourceTree = ""; }; 5EA018231EC7B226001F2996 /* WaveTrackControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WaveTrackControls.cpp; sourceTree = ""; }; 5EA018241EC7B226001F2996 /* WaveTrackControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WaveTrackControls.h; sourceTree = ""; }; - 5EA018251EC7B226001F2996 /* WaveTrackUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WaveTrackUI.cpp; sourceTree = ""; }; 5EA018261EC7B226001F2996 /* WaveTrackVRulerControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WaveTrackVRulerControls.cpp; sourceTree = ""; }; 5EA018271EC7B226001F2996 /* WaveTrackVRulerControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WaveTrackVRulerControls.h; sourceTree = ""; }; 5EB15A1E22A94043009FEC89 /* ProjectHistory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectHistory.cpp; sourceTree = ""; }; @@ -6181,12 +6186,13 @@ 5E7396651DAFDB5600BA0A4D /* LabelGlyphHandle.cpp */, 5E7396671DAFDB5600BA0A4D /* LabelTextHandle.cpp */, 5E1512401DB000DC00702E29 /* LabelTrackControls.cpp */, - 5E1512421DB000DC00702E29 /* LabelTrackUI.cpp */, + 5E2BF38F2193A31A00995694 /* LabelTrackView.cpp */, 5E1512431DB000DC00702E29 /* LabelTrackVRulerControls.cpp */, 5E7396641DAFDB5600BA0A4D /* LabelDefaultClickHandle.h */, 5E7396661DAFDB5600BA0A4D /* LabelGlyphHandle.h */, 5E7396681DAFDB5600BA0A4D /* LabelTextHandle.h */, 5E1512411DB000DC00702E29 /* LabelTrackControls.h */, + 5E2BF3902193A31A00995694 /* LabelTrackView.h */, 5E1512441DB000DC00702E29 /* LabelTrackVRulerControls.h */, ); path = ui; @@ -6204,9 +6210,10 @@ isa = PBXGroup; children = ( 5E15124E1DB000DC00702E29 /* TimeTrackControls.cpp */, - 5E1512501DB000DC00702E29 /* TimeTrackUI.cpp */, + 5E2BF3862193A2BD00995694 /* TimeTrackView.cpp */, 5E1512511DB000DC00702E29 /* TimeTrackVRulerControls.cpp */, 5E15124F1DB000DC00702E29 /* TimeTrackControls.h */, + 5E2BF3872193A2BD00995694 /* TimeTrackView.h */, 5E1512521DB000DC00702E29 /* TimeTrackVRulerControls.h */, ); path = ui; @@ -6260,7 +6267,7 @@ 5E7396571DAFDA3600BA0A4D /* TrackButtonHandles.cpp */, 5E1512681DB0010C00702E29 /* TrackControls.cpp */, 5E73965D1DAFDAEC00BA0A4D /* TrackSelectHandle.cpp */, - 5E15126A1DB0010C00702E29 /* TrackUI.cpp */, + 5E2BF3832193A2A500995694 /* TrackView.cpp */, 5E15126B1DB0010C00702E29 /* TrackVRulerControls.cpp */, 5E73963C1DAFD86000BA0A4D /* ZoomHandle.cpp */, 5E73965B1DAFDAA400BA0A4D /* BackgroundCell.h */, @@ -6276,6 +6283,7 @@ 5E7396581DAFDA3600BA0A4D /* TrackButtonHandles.h */, 5E1512691DB0010C00702E29 /* TrackControls.h */, 5E73965E1DAFDAEC00BA0A4D /* TrackSelectHandle.h */, + 5E2BF3842193A2A500995694 /* TrackView.h */, 5E15126C1DB0010C00702E29 /* TrackVRulerControls.h */, 5E73963D1DAFD86000BA0A4D /* ZoomHandle.h */, ); @@ -6306,13 +6314,14 @@ 5E667A611F0BEE8C00C942A5 /* NoteTrackButtonHandle.cpp */, 5EA0181C1EC7B226001F2996 /* NoteTrackControls.cpp */, 5E3FFE701EC9032B0020F7C9 /* NoteTrackSliderHandles.cpp */, - 5EA0181E1EC7B226001F2996 /* NoteTrackUI.cpp */, + 5E2BF38C2193A30000995694 /* NoteTrackView.cpp */, 5EA0181F1EC7B226001F2996 /* NoteTrackVRulerControls.cpp */, 5E667A631F0BEE8C00C942A5 /* NoteTrackVZoomHandle.cpp */, 5E73966C1DAFDB8500BA0A4D /* StretchHandle.cpp */, 5E667A621F0BEE8C00C942A5 /* NoteTrackButtonHandle.h */, 5EA0181D1EC7B226001F2996 /* NoteTrackControls.h */, 5E3FFE711EC9032B0020F7C9 /* NoteTrackSliderHandles.h */, + 5E2BF38D2193A30000995694 /* NoteTrackView.h */, 5EA018201EC7B226001F2996 /* NoteTrackVRulerControls.h */, 5E667A641F0BEE8C00C942A5 /* NoteTrackVZoomHandle.h */, 5E73966D1DAFDB8500BA0A4D /* StretchHandle.h */, @@ -6335,13 +6344,14 @@ 5E000A1F1EC7B5D500E8FD93 /* SampleHandle.cpp */, 5EA018231EC7B226001F2996 /* WaveTrackControls.cpp */, 5E7396541DAFDA0000BA0A4D /* WaveTrackSliderHandles.cpp */, - 5EA018251EC7B226001F2996 /* WaveTrackUI.cpp */, + 5E2BF3892193A2E400995694 /* WaveTrackView.cpp */, 5EA018261EC7B226001F2996 /* WaveTrackVRulerControls.cpp */, 5E667A5E1F0BEE5F00C942A5 /* WaveTrackVZoomHandle.cpp */, 5E7396491DAFD91D00BA0A4D /* CutlineHandle.h */, 5E000A201EC7B5D500E8FD93 /* SampleHandle.h */, 5EA018241EC7B226001F2996 /* WaveTrackControls.h */, 5E7396551DAFDA0000BA0A4D /* WaveTrackSliderHandles.h */, + 5E2BF38A2193A2E400995694 /* WaveTrackView.h */, 5EA018271EC7B226001F2996 /* WaveTrackVRulerControls.h */, 5E667A5F1F0BEE5F00C942A5 /* WaveTrackVZoomHandle.h */, ); @@ -8313,6 +8323,7 @@ 1790B11C09883BFD008A330A /* AudioIO.cpp in Sources */, 1790B11D09883BFD008A330A /* BatchCommandDialog.cpp in Sources */, 1790B11E09883BFD008A330A /* BatchCommands.cpp in Sources */, + 5E2BF3852193A2A500995694 /* TrackView.cpp in Sources */, 5ED1D0B11CDE560C00471E3C /* BackedPanel.cpp in Sources */, 1790B11F09883BFD008A330A /* BatchProcessDialog.cpp in Sources */, 5E0A1CDD20E95FF7001AAF8D /* CellularPanel.cpp in Sources */, @@ -8350,6 +8361,7 @@ 1790B14309883BFD008A330A /* Noise.cpp in Sources */, 1790B14409883BFD008A330A /* NoiseRemoval.cpp in Sources */, 1790B14509883BFD008A330A /* Normalize.cpp in Sources */, + 5E2BF3912193A31A00995694 /* LabelTrackView.cpp in Sources */, 1790B14609883BFD008A330A /* LoadNyquist.cpp in Sources */, 1790B14709883BFD008A330A /* Nyquist.cpp in Sources */, 1790B14809883BFD008A330A /* Phaser.cpp in Sources */, @@ -8384,11 +8396,11 @@ 1790B16609883BFD008A330A /* ImageManipulation.cpp in Sources */, 5E79B3411D5CC38D001D677D /* ImportGStreamer.cpp in Sources */, 1790B16709883BFD008A330A /* Import.cpp in Sources */, + 5E2BF38E2193A30000995694 /* NoteTrackView.cpp in Sources */, 1790B16809883BFD008A330A /* ImportFLAC.cpp in Sources */, 5E135A3C229EDF2E0076E983 /* ProjectManager.cpp in Sources */, 1790B16909883BFD008A330A /* ImportLOF.cpp in Sources */, 1790B16A09883BFD008A330A /* ImportMIDI.cpp in Sources */, - 5E1512611DB000DC00702E29 /* TimeTrackUI.cpp in Sources */, 1790B16B09883BFD008A330A /* ImportMP3.cpp in Sources */, 1790B16C09883BFD008A330A /* ImportOGG.cpp in Sources */, 1790B16D09883BFD008A330A /* ImportPCM.cpp in Sources */, @@ -8437,6 +8449,7 @@ 1790B19709883BFD008A330A /* Track.cpp in Sources */, 1790B19809883BFD008A330A /* TrackArtist.cpp in Sources */, 5EF3E653203FBBE0006C6882 /* CommandTargets.cpp in Sources */, + 5E2BF38B2193A2E400995694 /* WaveTrackView.cpp in Sources */, 1790B19909883BFD008A330A /* TrackPanel.cpp in Sources */, 5E667A601F0BEE5F00C942A5 /* WaveTrackVZoomHandle.cpp in Sources */, 1790B19A09883BFD008A330A /* TrackPanelAx.cpp in Sources */, @@ -8501,6 +8514,7 @@ 2897F6F70AB3DB5A003C20C5 /* ToolManager.cpp in Sources */, 2897F6F80AB3DB5A003C20C5 /* ToolsToolBar.cpp in Sources */, 5EF3E662203FE73C006C6882 /* DragCommand.cpp in Sources */, + 5E2BF3882193A2BD00995694 /* TimeTrackView.cpp in Sources */, 2897F6F90AB3DB5A003C20C5 /* TranscriptionToolBar.cpp in Sources */, 2897F6FE0AB3DCD0003C20C5 /* Grabber.cpp in Sources */, 283DE1360AC0D4FD00E8C3AE /* XMLWriter.cpp in Sources */, @@ -8540,7 +8554,6 @@ 1841B50E0E00AD6E00F386E9 /* ODWaveTrackTaskQueue.cpp in Sources */, 1841B5110E00AD8D00F386E9 /* ODPCMAliasBlockFile.cpp in Sources */, 2860BA240E0F0D8600A13878 /* SoundActivatedRecord.cpp in Sources */, - 5EA0182C1EC7B226001F2996 /* WaveTrackUI.cpp in Sources */, 5E07842E1DEE6B8600CA76EA /* FileException.cpp in Sources */, 2860BA250E0F0D8600A13878 /* TimerRecordDialog.cpp in Sources */, 5E19F59922A9665500E3F88E /* AutoRecoveryDialog.cpp in Sources */, @@ -8577,7 +8590,6 @@ 284B27E40FC66CCD005EAC96 /* TracksPrefs.cpp in Sources */, 284B27E50FC66CCD005EAC96 /* WarningsPrefs.cpp in Sources */, 659B26C5207501970039894A /* WindowAccessible.cpp in Sources */, - 5E15125B1DB000DC00702E29 /* LabelTrackUI.cpp in Sources */, 5E667A691F0D723A00C942A5 /* TrackPanelResizerCell.cpp in Sources */, 28D540050FD1912A00FA7C75 /* AppCommandEvent.cpp in Sources */, 5E36A0AC217FA2430068E082 /* SelectMenus.cpp in Sources */, @@ -8589,7 +8601,6 @@ 28DB34790FDC2C5D0011F589 /* ResponseQueue.cpp in Sources */, 28DABFBE0FF19DB100AC7848 /* RealFFTf.cpp in Sources */, 2800FE370FF32566005CA9E5 /* MidiIOPrefs.cpp in Sources */, - 5E15126F1DB0010C00702E29 /* TrackUI.cpp in Sources */, 5EA0182B1EC7B226001F2996 /* WaveTrackControls.cpp in Sources */, 1818559A0FFE916C0026D190 /* ScreenshotCommand.cpp in Sources */, 1865A9B81004490500946EE6 /* Lyrics.cpp in Sources */, @@ -8720,7 +8731,6 @@ 28F6717A197DFA1C00075C32 /* MultiFormatReader.cpp in Sources */, 28F6717B197DFA1C00075C32 /* SpecPowerMeter.cpp in Sources */, 280A8B4719F4403B0091DE70 /* ModuleManager.cpp in Sources */, - 5EA018291EC7B226001F2996 /* NoteTrackUI.cpp in Sources */, 280A8B4A19F440880091DE70 /* EffectRack.cpp in Sources */, 5E7396471DAFD8F200BA0A4D /* EnvelopeHandle.cpp in Sources */, 5E135A4E22A62B7E0076E983 /* MeterPanelBase.cpp in Sources */, diff --git a/src/Makefile.am b/src/Makefile.am index 4514ff451..ca1e5a73f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -632,7 +632,8 @@ audacity_SOURCES = \ tracks/labeltrack/ui/LabelTextHandle.h \ tracks/labeltrack/ui/LabelTrackControls.cpp \ tracks/labeltrack/ui/LabelTrackControls.h \ - tracks/labeltrack/ui/LabelTrackUI.cpp \ + tracks/labeltrack/ui/LabelTrackView.cpp \ + tracks/labeltrack/ui/LabelTrackView.h \ tracks/labeltrack/ui/LabelTrackVRulerControls.cpp \ tracks/labeltrack/ui/LabelTrackVRulerControls.h \ tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp \ @@ -641,7 +642,8 @@ audacity_SOURCES = \ tracks/playabletrack/notetrack/ui/NoteTrackControls.h \ tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp \ tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.h \ - tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp \ + tracks/playabletrack/notetrack/ui/NoteTrackView.cpp \ + tracks/playabletrack/notetrack/ui/NoteTrackView.h \ tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp \ tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.h \ tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp \ @@ -658,14 +660,16 @@ audacity_SOURCES = \ tracks/playabletrack/wavetrack/ui/WaveTrackControls.h \ tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp \ tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.h \ + tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp \ + tracks/playabletrack/wavetrack/ui/WaveTrackView.h \ tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp \ tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.h \ tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp \ tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h \ - tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp \ tracks/timetrack/ui/TimeTrackControls.cpp \ tracks/timetrack/ui/TimeTrackControls.h \ - tracks/timetrack/ui/TimeTrackUI.cpp \ + tracks/timetrack/ui/TimeTrackView.cpp \ + tracks/timetrack/ui/TimeTrackView.h \ tracks/timetrack/ui/TimeTrackVRulerControls.cpp \ tracks/timetrack/ui/TimeTrackVRulerControls.h \ tracks/ui/BackgroundCell.cpp \ @@ -694,7 +698,8 @@ audacity_SOURCES = \ tracks/ui/TrackControls.h \ tracks/ui/TrackSelectHandle.cpp \ tracks/ui/TrackSelectHandle.h \ - tracks/ui/TrackUI.cpp \ + tracks/ui/TrackView.cpp \ + tracks/ui/TrackView.h \ tracks/ui/TrackVRulerControls.cpp \ tracks/ui/TrackVRulerControls.h \ tracks/ui/ZoomHandle.cpp \ diff --git a/src/Makefile.in b/src/Makefile.in index 380298ea2..2c22be152 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -500,7 +500,8 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ tracks/labeltrack/ui/LabelTextHandle.h \ tracks/labeltrack/ui/LabelTrackControls.cpp \ tracks/labeltrack/ui/LabelTrackControls.h \ - tracks/labeltrack/ui/LabelTrackUI.cpp \ + tracks/labeltrack/ui/LabelTrackView.cpp \ + tracks/labeltrack/ui/LabelTrackView.h \ tracks/labeltrack/ui/LabelTrackVRulerControls.cpp \ tracks/labeltrack/ui/LabelTrackVRulerControls.h \ tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp \ @@ -509,7 +510,8 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ tracks/playabletrack/notetrack/ui/NoteTrackControls.h \ tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp \ tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.h \ - tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp \ + tracks/playabletrack/notetrack/ui/NoteTrackView.cpp \ + tracks/playabletrack/notetrack/ui/NoteTrackView.h \ tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp \ tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.h \ tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp \ @@ -526,14 +528,16 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ tracks/playabletrack/wavetrack/ui/WaveTrackControls.h \ tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp \ tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.h \ + tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp \ + tracks/playabletrack/wavetrack/ui/WaveTrackView.h \ tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp \ tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.h \ tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp \ tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h \ - tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp \ tracks/timetrack/ui/TimeTrackControls.cpp \ tracks/timetrack/ui/TimeTrackControls.h \ - tracks/timetrack/ui/TimeTrackUI.cpp \ + tracks/timetrack/ui/TimeTrackView.cpp \ + tracks/timetrack/ui/TimeTrackView.h \ tracks/timetrack/ui/TimeTrackVRulerControls.cpp \ tracks/timetrack/ui/TimeTrackVRulerControls.h \ tracks/ui/BackgroundCell.cpp tracks/ui/BackgroundCell.h \ @@ -550,8 +554,8 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ tracks/ui/TimeShiftHandle.h tracks/ui/TrackButtonHandles.cpp \ tracks/ui/TrackButtonHandles.h tracks/ui/TrackControls.cpp \ tracks/ui/TrackControls.h tracks/ui/TrackSelectHandle.cpp \ - tracks/ui/TrackSelectHandle.h tracks/ui/TrackUI.cpp \ - tracks/ui/TrackVRulerControls.cpp \ + tracks/ui/TrackSelectHandle.h tracks/ui/TrackView.cpp \ + tracks/ui/TrackView.h tracks/ui/TrackVRulerControls.cpp \ tracks/ui/TrackVRulerControls.h tracks/ui/ZoomHandle.cpp \ tracks/ui/ZoomHandle.h widgets/AButton.cpp widgets/AButton.h \ widgets/ASlider.cpp widgets/ASlider.h \ @@ -862,12 +866,12 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \ tracks/labeltrack/ui/audacity-LabelGlyphHandle.$(OBJEXT) \ tracks/labeltrack/ui/audacity-LabelTextHandle.$(OBJEXT) \ tracks/labeltrack/ui/audacity-LabelTrackControls.$(OBJEXT) \ - tracks/labeltrack/ui/audacity-LabelTrackUI.$(OBJEXT) \ + tracks/labeltrack/ui/audacity-LabelTrackView.$(OBJEXT) \ tracks/labeltrack/ui/audacity-LabelTrackVRulerControls.$(OBJEXT) \ tracks/playabletrack/notetrack/ui/audacity-NoteTrackButtonHandle.$(OBJEXT) \ tracks/playabletrack/notetrack/ui/audacity-NoteTrackControls.$(OBJEXT) \ tracks/playabletrack/notetrack/ui/audacity-NoteTrackSliderHandles.$(OBJEXT) \ - tracks/playabletrack/notetrack/ui/audacity-NoteTrackUI.$(OBJEXT) \ + tracks/playabletrack/notetrack/ui/audacity-NoteTrackView.$(OBJEXT) \ tracks/playabletrack/notetrack/ui/audacity-NoteTrackVRulerControls.$(OBJEXT) \ tracks/playabletrack/notetrack/ui/audacity-NoteTrackVZoomHandle.$(OBJEXT) \ tracks/playabletrack/notetrack/ui/audacity-StretchHandle.$(OBJEXT) \ @@ -876,11 +880,11 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \ tracks/playabletrack/wavetrack/ui/audacity-SampleHandle.$(OBJEXT) \ tracks/playabletrack/wavetrack/ui/audacity-WaveTrackControls.$(OBJEXT) \ tracks/playabletrack/wavetrack/ui/audacity-WaveTrackSliderHandles.$(OBJEXT) \ + tracks/playabletrack/wavetrack/ui/audacity-WaveTrackView.$(OBJEXT) \ tracks/playabletrack/wavetrack/ui/audacity-WaveTrackVRulerControls.$(OBJEXT) \ tracks/playabletrack/wavetrack/ui/audacity-WaveTrackVZoomHandle.$(OBJEXT) \ - tracks/playabletrack/wavetrack/ui/audacity-WaveTrackUI.$(OBJEXT) \ tracks/timetrack/ui/audacity-TimeTrackControls.$(OBJEXT) \ - tracks/timetrack/ui/audacity-TimeTrackUI.$(OBJEXT) \ + tracks/timetrack/ui/audacity-TimeTrackView.$(OBJEXT) \ tracks/timetrack/ui/audacity-TimeTrackVRulerControls.$(OBJEXT) \ tracks/ui/audacity-BackgroundCell.$(OBJEXT) \ tracks/ui/audacity-ButtonHandle.$(OBJEXT) \ @@ -895,7 +899,7 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \ tracks/ui/audacity-TrackButtonHandles.$(OBJEXT) \ tracks/ui/audacity-TrackControls.$(OBJEXT) \ tracks/ui/audacity-TrackSelectHandle.$(OBJEXT) \ - tracks/ui/audacity-TrackUI.$(OBJEXT) \ + tracks/ui/audacity-TrackView.$(OBJEXT) \ tracks/ui/audacity-TrackVRulerControls.$(OBJEXT) \ tracks/ui/audacity-ZoomHandle.$(OBJEXT) \ widgets/audacity-AButton.$(OBJEXT) \ @@ -1582,7 +1586,8 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ tracks/labeltrack/ui/LabelTextHandle.h \ tracks/labeltrack/ui/LabelTrackControls.cpp \ tracks/labeltrack/ui/LabelTrackControls.h \ - tracks/labeltrack/ui/LabelTrackUI.cpp \ + tracks/labeltrack/ui/LabelTrackView.cpp \ + tracks/labeltrack/ui/LabelTrackView.h \ tracks/labeltrack/ui/LabelTrackVRulerControls.cpp \ tracks/labeltrack/ui/LabelTrackVRulerControls.h \ tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp \ @@ -1591,7 +1596,8 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ tracks/playabletrack/notetrack/ui/NoteTrackControls.h \ tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp \ tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.h \ - tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp \ + tracks/playabletrack/notetrack/ui/NoteTrackView.cpp \ + tracks/playabletrack/notetrack/ui/NoteTrackView.h \ tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp \ tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.h \ tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp \ @@ -1608,14 +1614,16 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ tracks/playabletrack/wavetrack/ui/WaveTrackControls.h \ tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp \ tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.h \ + tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp \ + tracks/playabletrack/wavetrack/ui/WaveTrackView.h \ tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp \ tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.h \ tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp \ tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h \ - tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp \ tracks/timetrack/ui/TimeTrackControls.cpp \ tracks/timetrack/ui/TimeTrackControls.h \ - tracks/timetrack/ui/TimeTrackUI.cpp \ + tracks/timetrack/ui/TimeTrackView.cpp \ + tracks/timetrack/ui/TimeTrackView.h \ tracks/timetrack/ui/TimeTrackVRulerControls.cpp \ tracks/timetrack/ui/TimeTrackVRulerControls.h \ tracks/ui/BackgroundCell.cpp tracks/ui/BackgroundCell.h \ @@ -1632,8 +1640,8 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ tracks/ui/TimeShiftHandle.h tracks/ui/TrackButtonHandles.cpp \ tracks/ui/TrackButtonHandles.h tracks/ui/TrackControls.cpp \ tracks/ui/TrackControls.h tracks/ui/TrackSelectHandle.cpp \ - tracks/ui/TrackSelectHandle.h tracks/ui/TrackUI.cpp \ - tracks/ui/TrackVRulerControls.cpp \ + tracks/ui/TrackSelectHandle.h tracks/ui/TrackView.cpp \ + tracks/ui/TrackView.h tracks/ui/TrackVRulerControls.cpp \ tracks/ui/TrackVRulerControls.h tracks/ui/ZoomHandle.cpp \ tracks/ui/ZoomHandle.h widgets/AButton.cpp widgets/AButton.h \ widgets/ASlider.cpp widgets/ASlider.h \ @@ -2224,7 +2232,7 @@ tracks/labeltrack/ui/audacity-LabelTextHandle.$(OBJEXT): \ tracks/labeltrack/ui/audacity-LabelTrackControls.$(OBJEXT): \ tracks/labeltrack/ui/$(am__dirstamp) \ tracks/labeltrack/ui/$(DEPDIR)/$(am__dirstamp) -tracks/labeltrack/ui/audacity-LabelTrackUI.$(OBJEXT): \ +tracks/labeltrack/ui/audacity-LabelTrackView.$(OBJEXT): \ tracks/labeltrack/ui/$(am__dirstamp) \ tracks/labeltrack/ui/$(DEPDIR)/$(am__dirstamp) tracks/labeltrack/ui/audacity-LabelTrackVRulerControls.$(OBJEXT): \ @@ -2245,7 +2253,7 @@ tracks/playabletrack/notetrack/ui/audacity-NoteTrackControls.$(OBJEXT): \ tracks/playabletrack/notetrack/ui/audacity-NoteTrackSliderHandles.$(OBJEXT): \ tracks/playabletrack/notetrack/ui/$(am__dirstamp) \ tracks/playabletrack/notetrack/ui/$(DEPDIR)/$(am__dirstamp) -tracks/playabletrack/notetrack/ui/audacity-NoteTrackUI.$(OBJEXT): \ +tracks/playabletrack/notetrack/ui/audacity-NoteTrackView.$(OBJEXT): \ tracks/playabletrack/notetrack/ui/$(am__dirstamp) \ tracks/playabletrack/notetrack/ui/$(DEPDIR)/$(am__dirstamp) tracks/playabletrack/notetrack/ui/audacity-NoteTrackVRulerControls.$(OBJEXT): \ @@ -2284,15 +2292,15 @@ tracks/playabletrack/wavetrack/ui/audacity-WaveTrackControls.$(OBJEXT): \ tracks/playabletrack/wavetrack/ui/audacity-WaveTrackSliderHandles.$(OBJEXT): \ tracks/playabletrack/wavetrack/ui/$(am__dirstamp) \ tracks/playabletrack/wavetrack/ui/$(DEPDIR)/$(am__dirstamp) +tracks/playabletrack/wavetrack/ui/audacity-WaveTrackView.$(OBJEXT): \ + tracks/playabletrack/wavetrack/ui/$(am__dirstamp) \ + tracks/playabletrack/wavetrack/ui/$(DEPDIR)/$(am__dirstamp) tracks/playabletrack/wavetrack/ui/audacity-WaveTrackVRulerControls.$(OBJEXT): \ tracks/playabletrack/wavetrack/ui/$(am__dirstamp) \ tracks/playabletrack/wavetrack/ui/$(DEPDIR)/$(am__dirstamp) tracks/playabletrack/wavetrack/ui/audacity-WaveTrackVZoomHandle.$(OBJEXT): \ tracks/playabletrack/wavetrack/ui/$(am__dirstamp) \ tracks/playabletrack/wavetrack/ui/$(DEPDIR)/$(am__dirstamp) -tracks/playabletrack/wavetrack/ui/audacity-WaveTrackUI.$(OBJEXT): \ - tracks/playabletrack/wavetrack/ui/$(am__dirstamp) \ - tracks/playabletrack/wavetrack/ui/$(DEPDIR)/$(am__dirstamp) tracks/timetrack/ui/$(am__dirstamp): @$(MKDIR_P) tracks/timetrack/ui @: > tracks/timetrack/ui/$(am__dirstamp) @@ -2302,7 +2310,7 @@ tracks/timetrack/ui/$(DEPDIR)/$(am__dirstamp): tracks/timetrack/ui/audacity-TimeTrackControls.$(OBJEXT): \ tracks/timetrack/ui/$(am__dirstamp) \ tracks/timetrack/ui/$(DEPDIR)/$(am__dirstamp) -tracks/timetrack/ui/audacity-TimeTrackUI.$(OBJEXT): \ +tracks/timetrack/ui/audacity-TimeTrackView.$(OBJEXT): \ tracks/timetrack/ui/$(am__dirstamp) \ tracks/timetrack/ui/$(DEPDIR)/$(am__dirstamp) tracks/timetrack/ui/audacity-TimeTrackVRulerControls.$(OBJEXT): \ @@ -2340,7 +2348,7 @@ tracks/ui/audacity-TrackControls.$(OBJEXT): tracks/ui/$(am__dirstamp) \ tracks/ui/$(DEPDIR)/$(am__dirstamp) tracks/ui/audacity-TrackSelectHandle.$(OBJEXT): \ tracks/ui/$(am__dirstamp) tracks/ui/$(DEPDIR)/$(am__dirstamp) -tracks/ui/audacity-TrackUI.$(OBJEXT): tracks/ui/$(am__dirstamp) \ +tracks/ui/audacity-TrackView.$(OBJEXT): tracks/ui/$(am__dirstamp) \ tracks/ui/$(DEPDIR)/$(am__dirstamp) tracks/ui/audacity-TrackVRulerControls.$(OBJEXT): \ tracks/ui/$(am__dirstamp) tracks/ui/$(DEPDIR)/$(am__dirstamp) @@ -2836,26 +2844,26 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelGlyphHandle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTextHandle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackControls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackUI.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackVRulerControls.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackView.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackButtonHandle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackControls.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackSliderHandles.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackUI.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackVRulerControls.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackVZoomHandle.Po@am__quote@ +@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/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@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackSliderHandles.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackUI.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackVRulerControls.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackVZoomHandle.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackView.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackControls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackUI.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackVRulerControls.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackView.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-BackgroundCell.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-ButtonHandle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-CommonTrackPanelCell.Po@am__quote@ @@ -2869,8 +2877,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-TrackButtonHandles.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-TrackControls.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-TrackSelectHandle.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-TrackUI.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-TrackVRulerControls.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-TrackView.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-ZoomHandle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/audacity-AButton.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/audacity-ASlider.Po@am__quote@ @@ -6940,19 +6948,19 @@ tracks/labeltrack/ui/audacity-LabelTrackControls.obj: tracks/labeltrack/ui/Label @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/labeltrack/ui/audacity-LabelTrackControls.obj `if test -f 'tracks/labeltrack/ui/LabelTrackControls.cpp'; then $(CYGPATH_W) 'tracks/labeltrack/ui/LabelTrackControls.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/labeltrack/ui/LabelTrackControls.cpp'; fi` -tracks/labeltrack/ui/audacity-LabelTrackUI.o: tracks/labeltrack/ui/LabelTrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/labeltrack/ui/audacity-LabelTrackUI.o -MD -MP -MF tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackUI.Tpo -c -o tracks/labeltrack/ui/audacity-LabelTrackUI.o `test -f 'tracks/labeltrack/ui/LabelTrackUI.cpp' || echo '$(srcdir)/'`tracks/labeltrack/ui/LabelTrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackUI.Tpo tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackUI.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/labeltrack/ui/LabelTrackUI.cpp' object='tracks/labeltrack/ui/audacity-LabelTrackUI.o' libtool=no @AMDEPBACKSLASH@ +tracks/labeltrack/ui/audacity-LabelTrackView.o: tracks/labeltrack/ui/LabelTrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/labeltrack/ui/audacity-LabelTrackView.o -MD -MP -MF tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackView.Tpo -c -o tracks/labeltrack/ui/audacity-LabelTrackView.o `test -f 'tracks/labeltrack/ui/LabelTrackView.cpp' || echo '$(srcdir)/'`tracks/labeltrack/ui/LabelTrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackView.Tpo tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackView.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/labeltrack/ui/LabelTrackView.cpp' object='tracks/labeltrack/ui/audacity-LabelTrackView.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/labeltrack/ui/audacity-LabelTrackUI.o `test -f 'tracks/labeltrack/ui/LabelTrackUI.cpp' || echo '$(srcdir)/'`tracks/labeltrack/ui/LabelTrackUI.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o tracks/labeltrack/ui/audacity-LabelTrackView.o `test -f 'tracks/labeltrack/ui/LabelTrackView.cpp' || echo '$(srcdir)/'`tracks/labeltrack/ui/LabelTrackView.cpp -tracks/labeltrack/ui/audacity-LabelTrackUI.obj: tracks/labeltrack/ui/LabelTrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/labeltrack/ui/audacity-LabelTrackUI.obj -MD -MP -MF tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackUI.Tpo -c -o tracks/labeltrack/ui/audacity-LabelTrackUI.obj `if test -f 'tracks/labeltrack/ui/LabelTrackUI.cpp'; then $(CYGPATH_W) 'tracks/labeltrack/ui/LabelTrackUI.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/labeltrack/ui/LabelTrackUI.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackUI.Tpo tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackUI.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/labeltrack/ui/LabelTrackUI.cpp' object='tracks/labeltrack/ui/audacity-LabelTrackUI.obj' libtool=no @AMDEPBACKSLASH@ +tracks/labeltrack/ui/audacity-LabelTrackView.obj: tracks/labeltrack/ui/LabelTrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/labeltrack/ui/audacity-LabelTrackView.obj -MD -MP -MF tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackView.Tpo -c -o tracks/labeltrack/ui/audacity-LabelTrackView.obj `if test -f 'tracks/labeltrack/ui/LabelTrackView.cpp'; then $(CYGPATH_W) 'tracks/labeltrack/ui/LabelTrackView.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/labeltrack/ui/LabelTrackView.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackView.Tpo tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackView.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/labeltrack/ui/LabelTrackView.cpp' object='tracks/labeltrack/ui/audacity-LabelTrackView.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/labeltrack/ui/audacity-LabelTrackUI.obj `if test -f 'tracks/labeltrack/ui/LabelTrackUI.cpp'; then $(CYGPATH_W) 'tracks/labeltrack/ui/LabelTrackUI.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/labeltrack/ui/LabelTrackUI.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o tracks/labeltrack/ui/audacity-LabelTrackView.obj `if test -f 'tracks/labeltrack/ui/LabelTrackView.cpp'; then $(CYGPATH_W) 'tracks/labeltrack/ui/LabelTrackView.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/labeltrack/ui/LabelTrackView.cpp'; fi` tracks/labeltrack/ui/audacity-LabelTrackVRulerControls.o: tracks/labeltrack/ui/LabelTrackVRulerControls.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/labeltrack/ui/audacity-LabelTrackVRulerControls.o -MD -MP -MF tracks/labeltrack/ui/$(DEPDIR)/audacity-LabelTrackVRulerControls.Tpo -c -o tracks/labeltrack/ui/audacity-LabelTrackVRulerControls.o `test -f 'tracks/labeltrack/ui/LabelTrackVRulerControls.cpp' || echo '$(srcdir)/'`tracks/labeltrack/ui/LabelTrackVRulerControls.cpp @@ -7010,19 +7018,19 @@ tracks/playabletrack/notetrack/ui/audacity-NoteTrackSliderHandles.obj: tracks/pl @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/notetrack/ui/audacity-NoteTrackSliderHandles.obj `if test -f 'tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp'; then $(CYGPATH_W) 'tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp'; fi` -tracks/playabletrack/notetrack/ui/audacity-NoteTrackUI.o: tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/playabletrack/notetrack/ui/audacity-NoteTrackUI.o -MD -MP -MF tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackUI.Tpo -c -o tracks/playabletrack/notetrack/ui/audacity-NoteTrackUI.o `test -f 'tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp' || echo '$(srcdir)/'`tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackUI.Tpo tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackUI.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp' object='tracks/playabletrack/notetrack/ui/audacity-NoteTrackUI.o' libtool=no @AMDEPBACKSLASH@ +tracks/playabletrack/notetrack/ui/audacity-NoteTrackView.o: tracks/playabletrack/notetrack/ui/NoteTrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/playabletrack/notetrack/ui/audacity-NoteTrackView.o -MD -MP -MF tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackView.Tpo -c -o tracks/playabletrack/notetrack/ui/audacity-NoteTrackView.o `test -f 'tracks/playabletrack/notetrack/ui/NoteTrackView.cpp' || echo '$(srcdir)/'`tracks/playabletrack/notetrack/ui/NoteTrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackView.Tpo tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackView.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/playabletrack/notetrack/ui/NoteTrackView.cpp' object='tracks/playabletrack/notetrack/ui/audacity-NoteTrackView.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/notetrack/ui/audacity-NoteTrackUI.o `test -f 'tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp' || echo '$(srcdir)/'`tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o tracks/playabletrack/notetrack/ui/audacity-NoteTrackView.o `test -f 'tracks/playabletrack/notetrack/ui/NoteTrackView.cpp' || echo '$(srcdir)/'`tracks/playabletrack/notetrack/ui/NoteTrackView.cpp -tracks/playabletrack/notetrack/ui/audacity-NoteTrackUI.obj: tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/playabletrack/notetrack/ui/audacity-NoteTrackUI.obj -MD -MP -MF tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackUI.Tpo -c -o tracks/playabletrack/notetrack/ui/audacity-NoteTrackUI.obj `if test -f 'tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp'; then $(CYGPATH_W) 'tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackUI.Tpo tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackUI.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp' object='tracks/playabletrack/notetrack/ui/audacity-NoteTrackUI.obj' libtool=no @AMDEPBACKSLASH@ +tracks/playabletrack/notetrack/ui/audacity-NoteTrackView.obj: tracks/playabletrack/notetrack/ui/NoteTrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/playabletrack/notetrack/ui/audacity-NoteTrackView.obj -MD -MP -MF tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackView.Tpo -c -o tracks/playabletrack/notetrack/ui/audacity-NoteTrackView.obj `if test -f 'tracks/playabletrack/notetrack/ui/NoteTrackView.cpp'; then $(CYGPATH_W) 'tracks/playabletrack/notetrack/ui/NoteTrackView.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackView.Tpo tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackView.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/playabletrack/notetrack/ui/NoteTrackView.cpp' object='tracks/playabletrack/notetrack/ui/audacity-NoteTrackView.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/notetrack/ui/audacity-NoteTrackUI.obj `if test -f 'tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp'; then $(CYGPATH_W) 'tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o tracks/playabletrack/notetrack/ui/audacity-NoteTrackView.obj `if test -f 'tracks/playabletrack/notetrack/ui/NoteTrackView.cpp'; then $(CYGPATH_W) 'tracks/playabletrack/notetrack/ui/NoteTrackView.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp'; fi` tracks/playabletrack/notetrack/ui/audacity-NoteTrackVRulerControls.o: tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/playabletrack/notetrack/ui/audacity-NoteTrackVRulerControls.o -MD -MP -MF tracks/playabletrack/notetrack/ui/$(DEPDIR)/audacity-NoteTrackVRulerControls.Tpo -c -o tracks/playabletrack/notetrack/ui/audacity-NoteTrackVRulerControls.o `test -f 'tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp' || echo '$(srcdir)/'`tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp @@ -7136,6 +7144,20 @@ tracks/playabletrack/wavetrack/ui/audacity-WaveTrackSliderHandles.obj: tracks/pl @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/wavetrack/ui/audacity-WaveTrackSliderHandles.obj `if test -f 'tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp'; then $(CYGPATH_W) 'tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp'; fi` +tracks/playabletrack/wavetrack/ui/audacity-WaveTrackView.o: tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/playabletrack/wavetrack/ui/audacity-WaveTrackView.o -MD -MP -MF tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackView.Tpo -c -o tracks/playabletrack/wavetrack/ui/audacity-WaveTrackView.o `test -f 'tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp' || echo '$(srcdir)/'`tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackView.Tpo tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackView.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp' object='tracks/playabletrack/wavetrack/ui/audacity-WaveTrackView.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/wavetrack/ui/audacity-WaveTrackView.o `test -f 'tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp' || echo '$(srcdir)/'`tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp + +tracks/playabletrack/wavetrack/ui/audacity-WaveTrackView.obj: tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/playabletrack/wavetrack/ui/audacity-WaveTrackView.obj -MD -MP -MF tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackView.Tpo -c -o tracks/playabletrack/wavetrack/ui/audacity-WaveTrackView.obj `if test -f 'tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp'; then $(CYGPATH_W) 'tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackView.Tpo tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackView.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp' object='tracks/playabletrack/wavetrack/ui/audacity-WaveTrackView.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/wavetrack/ui/audacity-WaveTrackView.obj `if test -f 'tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp'; then $(CYGPATH_W) 'tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp'; fi` + tracks/playabletrack/wavetrack/ui/audacity-WaveTrackVRulerControls.o: tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/playabletrack/wavetrack/ui/audacity-WaveTrackVRulerControls.o -MD -MP -MF tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackVRulerControls.Tpo -c -o tracks/playabletrack/wavetrack/ui/audacity-WaveTrackVRulerControls.o `test -f 'tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp' || echo '$(srcdir)/'`tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackVRulerControls.Tpo tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackVRulerControls.Po @@ -7164,20 +7186,6 @@ tracks/playabletrack/wavetrack/ui/audacity-WaveTrackVZoomHandle.obj: tracks/play @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/wavetrack/ui/audacity-WaveTrackVZoomHandle.obj `if test -f 'tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp'; then $(CYGPATH_W) 'tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp'; fi` -tracks/playabletrack/wavetrack/ui/audacity-WaveTrackUI.o: tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/playabletrack/wavetrack/ui/audacity-WaveTrackUI.o -MD -MP -MF tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackUI.Tpo -c -o tracks/playabletrack/wavetrack/ui/audacity-WaveTrackUI.o `test -f 'tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp' || echo '$(srcdir)/'`tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackUI.Tpo tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackUI.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp' object='tracks/playabletrack/wavetrack/ui/audacity-WaveTrackUI.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/wavetrack/ui/audacity-WaveTrackUI.o `test -f 'tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp' || echo '$(srcdir)/'`tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp - -tracks/playabletrack/wavetrack/ui/audacity-WaveTrackUI.obj: tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/playabletrack/wavetrack/ui/audacity-WaveTrackUI.obj -MD -MP -MF tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackUI.Tpo -c -o tracks/playabletrack/wavetrack/ui/audacity-WaveTrackUI.obj `if test -f 'tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp'; then $(CYGPATH_W) 'tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackUI.Tpo tracks/playabletrack/wavetrack/ui/$(DEPDIR)/audacity-WaveTrackUI.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp' object='tracks/playabletrack/wavetrack/ui/audacity-WaveTrackUI.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/wavetrack/ui/audacity-WaveTrackUI.obj `if test -f 'tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp'; then $(CYGPATH_W) 'tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp'; fi` - tracks/timetrack/ui/audacity-TimeTrackControls.o: tracks/timetrack/ui/TimeTrackControls.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/timetrack/ui/audacity-TimeTrackControls.o -MD -MP -MF tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackControls.Tpo -c -o tracks/timetrack/ui/audacity-TimeTrackControls.o `test -f 'tracks/timetrack/ui/TimeTrackControls.cpp' || echo '$(srcdir)/'`tracks/timetrack/ui/TimeTrackControls.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackControls.Tpo tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackControls.Po @@ -7192,19 +7200,19 @@ tracks/timetrack/ui/audacity-TimeTrackControls.obj: tracks/timetrack/ui/TimeTrac @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/timetrack/ui/audacity-TimeTrackControls.obj `if test -f 'tracks/timetrack/ui/TimeTrackControls.cpp'; then $(CYGPATH_W) 'tracks/timetrack/ui/TimeTrackControls.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/timetrack/ui/TimeTrackControls.cpp'; fi` -tracks/timetrack/ui/audacity-TimeTrackUI.o: tracks/timetrack/ui/TimeTrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/timetrack/ui/audacity-TimeTrackUI.o -MD -MP -MF tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackUI.Tpo -c -o tracks/timetrack/ui/audacity-TimeTrackUI.o `test -f 'tracks/timetrack/ui/TimeTrackUI.cpp' || echo '$(srcdir)/'`tracks/timetrack/ui/TimeTrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackUI.Tpo tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackUI.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/timetrack/ui/TimeTrackUI.cpp' object='tracks/timetrack/ui/audacity-TimeTrackUI.o' libtool=no @AMDEPBACKSLASH@ +tracks/timetrack/ui/audacity-TimeTrackView.o: tracks/timetrack/ui/TimeTrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/timetrack/ui/audacity-TimeTrackView.o -MD -MP -MF tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackView.Tpo -c -o tracks/timetrack/ui/audacity-TimeTrackView.o `test -f 'tracks/timetrack/ui/TimeTrackView.cpp' || echo '$(srcdir)/'`tracks/timetrack/ui/TimeTrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackView.Tpo tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackView.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/timetrack/ui/TimeTrackView.cpp' object='tracks/timetrack/ui/audacity-TimeTrackView.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/timetrack/ui/audacity-TimeTrackUI.o `test -f 'tracks/timetrack/ui/TimeTrackUI.cpp' || echo '$(srcdir)/'`tracks/timetrack/ui/TimeTrackUI.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o tracks/timetrack/ui/audacity-TimeTrackView.o `test -f 'tracks/timetrack/ui/TimeTrackView.cpp' || echo '$(srcdir)/'`tracks/timetrack/ui/TimeTrackView.cpp -tracks/timetrack/ui/audacity-TimeTrackUI.obj: tracks/timetrack/ui/TimeTrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/timetrack/ui/audacity-TimeTrackUI.obj -MD -MP -MF tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackUI.Tpo -c -o tracks/timetrack/ui/audacity-TimeTrackUI.obj `if test -f 'tracks/timetrack/ui/TimeTrackUI.cpp'; then $(CYGPATH_W) 'tracks/timetrack/ui/TimeTrackUI.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/timetrack/ui/TimeTrackUI.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackUI.Tpo tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackUI.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/timetrack/ui/TimeTrackUI.cpp' object='tracks/timetrack/ui/audacity-TimeTrackUI.obj' libtool=no @AMDEPBACKSLASH@ +tracks/timetrack/ui/audacity-TimeTrackView.obj: tracks/timetrack/ui/TimeTrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/timetrack/ui/audacity-TimeTrackView.obj -MD -MP -MF tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackView.Tpo -c -o tracks/timetrack/ui/audacity-TimeTrackView.obj `if test -f 'tracks/timetrack/ui/TimeTrackView.cpp'; then $(CYGPATH_W) 'tracks/timetrack/ui/TimeTrackView.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/timetrack/ui/TimeTrackView.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackView.Tpo tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackView.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/timetrack/ui/TimeTrackView.cpp' object='tracks/timetrack/ui/audacity-TimeTrackView.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/timetrack/ui/audacity-TimeTrackUI.obj `if test -f 'tracks/timetrack/ui/TimeTrackUI.cpp'; then $(CYGPATH_W) 'tracks/timetrack/ui/TimeTrackUI.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/timetrack/ui/TimeTrackUI.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o tracks/timetrack/ui/audacity-TimeTrackView.obj `if test -f 'tracks/timetrack/ui/TimeTrackView.cpp'; then $(CYGPATH_W) 'tracks/timetrack/ui/TimeTrackView.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/timetrack/ui/TimeTrackView.cpp'; fi` tracks/timetrack/ui/audacity-TimeTrackVRulerControls.o: tracks/timetrack/ui/TimeTrackVRulerControls.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/timetrack/ui/audacity-TimeTrackVRulerControls.o -MD -MP -MF tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackVRulerControls.Tpo -c -o tracks/timetrack/ui/audacity-TimeTrackVRulerControls.o `test -f 'tracks/timetrack/ui/TimeTrackVRulerControls.cpp' || echo '$(srcdir)/'`tracks/timetrack/ui/TimeTrackVRulerControls.cpp @@ -7402,19 +7410,19 @@ tracks/ui/audacity-TrackSelectHandle.obj: tracks/ui/TrackSelectHandle.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-TrackSelectHandle.obj `if test -f 'tracks/ui/TrackSelectHandle.cpp'; then $(CYGPATH_W) 'tracks/ui/TrackSelectHandle.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/ui/TrackSelectHandle.cpp'; fi` -tracks/ui/audacity-TrackUI.o: tracks/ui/TrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/ui/audacity-TrackUI.o -MD -MP -MF tracks/ui/$(DEPDIR)/audacity-TrackUI.Tpo -c -o tracks/ui/audacity-TrackUI.o `test -f 'tracks/ui/TrackUI.cpp' || echo '$(srcdir)/'`tracks/ui/TrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/ui/$(DEPDIR)/audacity-TrackUI.Tpo tracks/ui/$(DEPDIR)/audacity-TrackUI.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/ui/TrackUI.cpp' object='tracks/ui/audacity-TrackUI.o' libtool=no @AMDEPBACKSLASH@ +tracks/ui/audacity-TrackView.o: tracks/ui/TrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/ui/audacity-TrackView.o -MD -MP -MF tracks/ui/$(DEPDIR)/audacity-TrackView.Tpo -c -o tracks/ui/audacity-TrackView.o `test -f 'tracks/ui/TrackView.cpp' || echo '$(srcdir)/'`tracks/ui/TrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/ui/$(DEPDIR)/audacity-TrackView.Tpo tracks/ui/$(DEPDIR)/audacity-TrackView.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/ui/TrackView.cpp' object='tracks/ui/audacity-TrackView.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-TrackUI.o `test -f 'tracks/ui/TrackUI.cpp' || echo '$(srcdir)/'`tracks/ui/TrackUI.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o tracks/ui/audacity-TrackView.o `test -f 'tracks/ui/TrackView.cpp' || echo '$(srcdir)/'`tracks/ui/TrackView.cpp -tracks/ui/audacity-TrackUI.obj: tracks/ui/TrackUI.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/ui/audacity-TrackUI.obj -MD -MP -MF tracks/ui/$(DEPDIR)/audacity-TrackUI.Tpo -c -o tracks/ui/audacity-TrackUI.obj `if test -f 'tracks/ui/TrackUI.cpp'; then $(CYGPATH_W) 'tracks/ui/TrackUI.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/ui/TrackUI.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/ui/$(DEPDIR)/audacity-TrackUI.Tpo tracks/ui/$(DEPDIR)/audacity-TrackUI.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/ui/TrackUI.cpp' object='tracks/ui/audacity-TrackUI.obj' libtool=no @AMDEPBACKSLASH@ +tracks/ui/audacity-TrackView.obj: tracks/ui/TrackView.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/ui/audacity-TrackView.obj -MD -MP -MF tracks/ui/$(DEPDIR)/audacity-TrackView.Tpo -c -o tracks/ui/audacity-TrackView.obj `if test -f 'tracks/ui/TrackView.cpp'; then $(CYGPATH_W) 'tracks/ui/TrackView.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/ui/TrackView.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tracks/ui/$(DEPDIR)/audacity-TrackView.Tpo tracks/ui/$(DEPDIR)/audacity-TrackView.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tracks/ui/TrackView.cpp' object='tracks/ui/audacity-TrackView.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-TrackUI.obj `if test -f 'tracks/ui/TrackUI.cpp'; then $(CYGPATH_W) 'tracks/ui/TrackUI.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/ui/TrackUI.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o tracks/ui/audacity-TrackView.obj `if test -f 'tracks/ui/TrackView.cpp'; then $(CYGPATH_W) 'tracks/ui/TrackView.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/ui/TrackView.cpp'; fi` tracks/ui/audacity-TrackVRulerControls.o: tracks/ui/TrackVRulerControls.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/ui/audacity-TrackVRulerControls.o -MD -MP -MF tracks/ui/$(DEPDIR)/audacity-TrackVRulerControls.Tpo -c -o tracks/ui/audacity-TrackVRulerControls.o `test -f 'tracks/ui/TrackVRulerControls.cpp' || echo '$(srcdir)/'`tracks/ui/TrackVRulerControls.cpp diff --git a/src/tracks/labeltrack/ui/LabelTrackUI.cpp b/src/tracks/labeltrack/ui/LabelTrackView.cpp similarity index 98% rename from src/tracks/labeltrack/ui/LabelTrackUI.cpp rename to src/tracks/labeltrack/ui/LabelTrackView.cpp index 1cca0dfc4..a22c1f846 100644 --- a/src/tracks/labeltrack/ui/LabelTrackUI.cpp +++ b/src/tracks/labeltrack/ui/LabelTrackView.cpp @@ -2,7 +2,7 @@ Audacity: A Digital Audio Editor -LabelTrackUI.cpp +LabelTrackView.cpp Paul Licameli split from TrackPanel.cpp diff --git a/src/tracks/labeltrack/ui/LabelTrackView.h b/src/tracks/labeltrack/ui/LabelTrackView.h new file mode 100644 index 000000000..e69de29bb diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp similarity index 98% rename from src/tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp rename to src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp index 350c3a881..c1cb98e6e 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp @@ -2,7 +2,7 @@ Audacity: A Digital Audio Editor -NoteTrackUI.cpp +NoteTrackView.cpp Paul Licameli split from TrackPanel.cpp diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackView.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackView.h new file mode 100644 index 000000000..e69de29bb diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp similarity index 99% rename from src/tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp rename to src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp index e77a7c863..141a074c8 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp @@ -2,7 +2,7 @@ Audacity: A Digital Audio Editor -WaveTrackUI.cpp +WaveTrackView.cpp Paul Licameli split from TrackPanel.cpp diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.h b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.h new file mode 100644 index 000000000..e69de29bb diff --git a/src/tracks/timetrack/ui/TimeTrackUI.cpp b/src/tracks/timetrack/ui/TimeTrackView.cpp similarity index 98% rename from src/tracks/timetrack/ui/TimeTrackUI.cpp rename to src/tracks/timetrack/ui/TimeTrackView.cpp index cc54ccfb0..8f3dfbca0 100644 --- a/src/tracks/timetrack/ui/TimeTrackUI.cpp +++ b/src/tracks/timetrack/ui/TimeTrackView.cpp @@ -2,7 +2,7 @@ Audacity: A Digital Audio Editor -TimeTrackUI.cpp +TimeTrackView.cpp Paul Licameli split from TrackPanel.cpp diff --git a/src/tracks/timetrack/ui/TimeTrackView.h b/src/tracks/timetrack/ui/TimeTrackView.h new file mode 100644 index 000000000..e69de29bb diff --git a/src/tracks/ui/TrackUI.cpp b/src/tracks/ui/TrackView.cpp similarity index 99% rename from src/tracks/ui/TrackUI.cpp rename to src/tracks/ui/TrackView.cpp index 988baacd2..31ee1e41d 100644 --- a/src/tracks/ui/TrackUI.cpp +++ b/src/tracks/ui/TrackView.cpp @@ -2,7 +2,7 @@ Audacity: A Digital Audio Editor -TrackUI.cpp +TrackView.cpp Paul Licameli split from TrackPanel.cpp diff --git a/src/tracks/ui/TrackView.h b/src/tracks/ui/TrackView.h new file mode 100644 index 000000000..e69de29bb diff --git a/win/Projects/Audacity/Audacity.vcxproj b/win/Projects/Audacity/Audacity.vcxproj index 7e0005e08..bb77b5c1d 100755 --- a/win/Projects/Audacity/Audacity.vcxproj +++ b/win/Projects/Audacity/Audacity.vcxproj @@ -276,12 +276,12 @@ - + - + @@ -290,11 +290,11 @@ - + - + @@ -309,7 +309,7 @@ - + @@ -574,9 +574,11 @@ + + @@ -585,6 +587,7 @@ + @@ -592,6 +595,7 @@ + @@ -603,6 +607,7 @@ + diff --git a/win/Projects/Audacity/Audacity.vcxproj.filters b/win/Projects/Audacity/Audacity.vcxproj.filters index 70d2245b0..02482fb63 100755 --- a/win/Projects/Audacity/Audacity.vcxproj.filters +++ b/win/Projects/Audacity/Audacity.vcxproj.filters @@ -953,15 +953,6 @@ src - - src\tracks\labeltrack\ui - - - src\tracks\timetrack\ui - - - src\tracks\ui - src @@ -1004,9 +995,6 @@ src\tracks\playabletrack\notetrack\ui - - src\tracks\playabletrack\notetrack\ui - src\tracks\playabletrack\notetrack\ui @@ -1016,9 +1004,6 @@ src\tracks\playabletrack\wavetrack\ui - - src\tracks\playabletrack\wavetrack\ui - src\tracks\playabletrack\wavetrack\ui @@ -1199,6 +1184,21 @@ src + + src\tracks\labeltrack\ui + + + src\tracks\playabletrack\notetrack\ui + + + src\tracks\playabletrack\wavetrack\ui + + + src\tracks\timetrack\ui + + + src\tracks\ui + @@ -2332,6 +2332,21 @@ src + + src\tracks\labeltrack\ui + + + src\tracks\playabletrack\notetrack\ui + + + src\tracks\playabletrack\wavetrack\ui + + + src\tracks\timetrack\ui + + + src\tracks\ui +