-
- Downloads
Merge from release-3.1.3 into master
Conflicts: src/AudioIO.cpp
Showing
- libraries/lib-audio-devices/AudioIOBase.h 3 additions, 1 deletionlibraries/lib-audio-devices/AudioIOBase.h
- libraries/lib-sample-track/Mix.cpp 3 additions, 9 deletionslibraries/lib-sample-track/Mix.cpp
- libraries/lib-sample-track/Mix.h 2 additions, 2 deletionslibraries/lib-sample-track/Mix.h
- libraries/lib-screen-geometry/ViewInfo.cpp 0 additions, 1 deletionlibraries/lib-screen-geometry/ViewInfo.cpp
- libraries/lib-screen-geometry/ViewInfo.h 0 additions, 2 deletionslibraries/lib-screen-geometry/ViewInfo.h
- src/AudioIO.cpp 0 additions, 16 deletionssrc/AudioIO.cpp
- src/AudioIO.h 0 additions, 2 deletionssrc/AudioIO.h
- src/PlaybackSchedule.cpp 78 additions, 31 deletionssrc/PlaybackSchedule.cpp
- src/PlaybackSchedule.h 31 additions, 14 deletionssrc/PlaybackSchedule.h
- src/ProjectAudioManager.cpp 9 additions, 4 deletionssrc/ProjectAudioManager.cpp
- src/ProjectSettings.cpp 8 additions, 0 deletionssrc/ProjectSettings.cpp
- src/ProjectSettings.h 4 additions, 5 deletionssrc/ProjectSettings.h
- src/ScrubState.cpp 4 additions, 12 deletionssrc/ScrubState.cpp
- src/ScrubState.h 0 additions, 1 deletionsrc/ScrubState.h
- src/menus/TransportMenus.cpp 3 additions, 2 deletionssrc/menus/TransportMenus.cpp
- src/toolbars/TranscriptionToolBar.cpp 7 additions, 12 deletionssrc/toolbars/TranscriptionToolBar.cpp
- src/tracks/ui/Scrubbing.cpp 1 addition, 93 deletionssrc/tracks/ui/Scrubbing.cpp
- src/tracks/ui/Scrubbing.h 0 additions, 1 deletionsrc/tracks/ui/Scrubbing.h
Loading
Please register or sign in to comment