External, Non-PPA KXStudio Repository
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

361 lines
42KB

  1. diff --git a/Projects/LinuxMakefile/Makefile b/Projects/LinuxMakefile/Makefile
  2. index 0e1965c..4fde8aa 100644
  3. --- a/Projects/LinuxMakefile/Makefile
  4. +++ b/Projects/LinuxMakefile/Makefile
  5. @@ -35,13 +35,13 @@ ifeq ($(CONFIG),Debug)
  6. TARGET_ARCH :=
  7. endif
  8. - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCER_LINUX_MAKE_B650AE49=1" "-DJUCE_APP_VERSION=3.16" "-DJUCE_APP_VERSION_HEX=0x31000" $(shell pkg-config --cflags alsa freetype2 libcurl) -pthread -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../ThirdParty/ASIO/common -I../../Source/ -I../../Source/Core -I../../Source/Core/Audio -I../../Source/Core/Audio/BuiltIn -I../../Source/Core/Audio/BuiltIn/SoundFont -I../../Source/Core/Audio/Instruments -I../../Source/Core/Audio/Transport -I../../Source/Core/Configuration -I../../Source/Core/Configuration/Resources -I../../Source/Core/Configuration/Resources/Models -I../../Source/Core/CommandPalette -I../../Source/Core/Midi -I../../Source/Core/Midi/Patterns -I../../Source/Core/Midi/Patterns/Modifiers -I../../Source/Core/Midi/Sequences -I../../Source/Core/Midi/Sequences/Events -I../../Source/Core/Network -I../../Source/Core/Network/Models -I../../Source/Core/Network/Requests -I../../Source/Core/Network/Services -I../../Source/Core/Serialization -I../../Source/Core/Tree -I../../Source/Core/Undo -I../../Source/Core/Undo/Actions -I../../Source/Core/VCS -I../../Source/Core/VCS/DiffLogic -I../../Source/Core/Workspace -I../../Source/UI/ -I../../Source/UI/Common -I../../Source/UI/Dialogs -I../../Source/UI/Headline -I../../Source/UI/Input -I../../Source/UI/Menus -I../../Source/UI/Menus/Base -I../../Source/UI/Menus/SelectionMenus -I../../Source/UI/Pages/Instruments -I../../Source/UI/Pages/Instruments/Editor -I../../Source/UI/Pages/Project -I../../Source/UI/Pages/Settings -I../../Source/UI/Pages/VCS -I../../Source/UI/Pages/Dashboard -I../../Source/UI/Popups -I../../Source/UI/Sequencer -I../../Source/UI/Sequencer/EditorPanels -I../../Source/UI/Sequencer/EditorPanels/AutomationEditor -I../../Source/UI/Sequencer/EditorPanels/VelocityEditor -I../../Source/UI/Sequencer/Header -I../../Source/UI/Sequencer/Helpers -I../../Source/UI/Sequencer/MiniMaps -I../../Source/UI/Sequencer/MiniMaps/AnnotationsMap -I../../Source/UI/Sequencer/MiniMaps/KeySignaturesMap -I../../Source/UI/Sequencer/MiniMaps/PianoMap -I../../Source/UI/Sequencer/MiniMaps/TimeSignaturesMap -I../../Source/UI/Sequencer/PatternRoll -I../../Source/UI/Sequencer/PianoRoll -I../../Source/UI/Sequencer/Sidebars -I../../Source/UI/Themes $(CPPFLAGS)
  9. + JUCE_CPPFLAGS := $(DEPFLAGS) "-DNO_NETWORK" "-DJUCE_USE_CURL=0" "-DJUCE_MODAL_LOOPS_PERMITTED=1" "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCER_LINUX_MAKE_B650AE49=1" "-DJUCE_APP_VERSION=3.16" "-DJUCE_APP_VERSION_HEX=0x31000" $(shell pkg-config --cflags alsa freetype2) -pthread -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../ThirdParty/ASIO/common -I../../Source/ -I../../Source/Core -I../../Source/Core/Audio -I../../Source/Core/Audio/BuiltIn -I../../Source/Core/Audio/BuiltIn/SoundFont -I../../Source/Core/Audio/Instruments -I../../Source/Core/Audio/Transport -I../../Source/Core/Configuration -I../../Source/Core/Configuration/Resources -I../../Source/Core/Configuration/Resources/Models -I../../Source/Core/CommandPalette -I../../Source/Core/Midi -I../../Source/Core/Midi/Patterns -I../../Source/Core/Midi/Patterns/Modifiers -I../../Source/Core/Midi/Sequences -I../../Source/Core/Midi/Sequences/Events -I../../Source/Core/Network -I../../Source/Core/Network/Models -I../../Source/Core/Network/Requests -I../../Source/Core/Network/Services -I../../Source/Core/Serialization -I../../Source/Core/Tree -I../../Source/Core/Undo -I../../Source/Core/Undo/Actions -I../../Source/Core/VCS -I../../Source/Core/VCS/DiffLogic -I../../Source/Core/Workspace -I../../Source/UI/ -I../../Source/UI/Common -I../../Source/UI/Dialogs -I../../Source/UI/Headline -I../../Source/UI/Input -I../../Source/UI/Menus -I../../Source/UI/Menus/Base -I../../Source/UI/Menus/SelectionMenus -I../../Source/UI/Pages/Instruments -I../../Source/UI/Pages/Instruments/Editor -I../../Source/UI/Pages/Project -I../../Source/UI/Pages/Settings -I../../Source/UI/Pages/VCS -I../../Source/UI/Pages/Dashboard -I../../Source/UI/Popups -I../../Source/UI/Sequencer -I../../Source/UI/Sequencer/EditorPanels -I../../Source/UI/Sequencer/EditorPanels/AutomationEditor -I../../Source/UI/Sequencer/EditorPanels/VelocityEditor -I../../Source/UI/Sequencer/Header -I../../Source/UI/Sequencer/Helpers -I../../Source/UI/Sequencer/MiniMaps -I../../Source/UI/Sequencer/MiniMaps/AnnotationsMap -I../../Source/UI/Sequencer/MiniMaps/KeySignaturesMap -I../../Source/UI/Sequencer/MiniMaps/PianoMap -I../../Source/UI/Sequencer/MiniMaps/TimeSignaturesMap -I../../Source/UI/Sequencer/PatternRoll -I../../Source/UI/Sequencer/PianoRoll -I../../Source/UI/Sequencer/Sidebars -I../../Source/UI/Themes $(CPPFLAGS)
  10. JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0"
  11. JUCE_TARGET_APP := helio
  12. JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -fpermissive -Wno-unknown-pragmas -Wno-reorder -Wno-dynamic-class-memaccess $(CFLAGS)
  13. - JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++14 $(CXXFLAGS)
  14. - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl) -fvisibility=hidden -lrt -ldl -lpthread -lGL $(LDFLAGS)
  15. + JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++17 $(CXXFLAGS)
  16. + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2) -fvisibility=hidden -lrt -ldl -lpthread -lGL $(LDFLAGS)
  17. CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR)
  18. endif
  19. @@ -56,13 +56,13 @@ ifeq ($(CONFIG),Tests)
  20. TARGET_ARCH :=
  21. endif
  22. - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_UNIT_TESTS=1" "-DJUCER_LINUX_MAKE_B650AE49=1" "-DJUCE_APP_VERSION=3.16" "-DJUCE_APP_VERSION_HEX=0x31000" $(shell pkg-config --cflags alsa freetype2 libcurl) -pthread -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../ThirdParty/ASIO/common -I../../Source/ -I../../Source/Core -I../../Source/Core/Audio -I../../Source/Core/Audio/BuiltIn -I../../Source/Core/Audio/BuiltIn/SoundFont -I../../Source/Core/Audio/Instruments -I../../Source/Core/Audio/Transport -I../../Source/Core/Configuration -I../../Source/Core/Configuration/Resources -I../../Source/Core/Configuration/Resources/Models -I../../Source/Core/CommandPalette -I../../Source/Core/Midi -I../../Source/Core/Midi/Patterns -I../../Source/Core/Midi/Patterns/Modifiers -I../../Source/Core/Midi/Sequences -I../../Source/Core/Midi/Sequences/Events -I../../Source/Core/Network -I../../Source/Core/Network/Models -I../../Source/Core/Network/Requests -I../../Source/Core/Network/Services -I../../Source/Core/Serialization -I../../Source/Core/Tree -I../../Source/Core/Undo -I../../Source/Core/Undo/Actions -I../../Source/Core/VCS -I../../Source/Core/VCS/DiffLogic -I../../Source/Core/Workspace -I../../Source/UI/ -I../../Source/UI/Common -I../../Source/UI/Dialogs -I../../Source/UI/Headline -I../../Source/UI/Input -I../../Source/UI/Menus -I../../Source/UI/Menus/Base -I../../Source/UI/Menus/SelectionMenus -I../../Source/UI/Pages/Instruments -I../../Source/UI/Pages/Instruments/Editor -I../../Source/UI/Pages/Project -I../../Source/UI/Pages/Settings -I../../Source/UI/Pages/VCS -I../../Source/UI/Pages/Dashboard -I../../Source/UI/Popups -I../../Source/UI/Sequencer -I../../Source/UI/Sequencer/EditorPanels -I../../Source/UI/Sequencer/EditorPanels/AutomationEditor -I../../Source/UI/Sequencer/EditorPanels/VelocityEditor -I../../Source/UI/Sequencer/Header -I../../Source/UI/Sequencer/Helpers -I../../Source/UI/Sequencer/MiniMaps -I../../Source/UI/Sequencer/MiniMaps/AnnotationsMap -I../../Source/UI/Sequencer/MiniMaps/KeySignaturesMap -I../../Source/UI/Sequencer/MiniMaps/PianoMap -I../../Source/UI/Sequencer/MiniMaps/TimeSignaturesMap -I../../Source/UI/Sequencer/PatternRoll -I../../Source/UI/Sequencer/PianoRoll -I../../Source/UI/Sequencer/Sidebars -I../../Source/UI/Themes $(CPPFLAGS)
  23. + JUCE_CPPFLAGS := $(DEPFLAGS) "-DNO_NETWORK" "-DJUCE_USE_CURL=0" "-DJUCE_MODAL_LOOPS_PERMITTED=1" "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_UNIT_TESTS=1" "-DJUCER_LINUX_MAKE_B650AE49=1" "-DJUCE_APP_VERSION=3.16" "-DJUCE_APP_VERSION_HEX=0x31000" $(shell pkg-config --cflags alsa freetype2) -pthread -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../ThirdParty/ASIO/common -I../../Source/ -I../../Source/Core -I../../Source/Core/Audio -I../../Source/Core/Audio/BuiltIn -I../../Source/Core/Audio/BuiltIn/SoundFont -I../../Source/Core/Audio/Instruments -I../../Source/Core/Audio/Transport -I../../Source/Core/Configuration -I../../Source/Core/Configuration/Resources -I../../Source/Core/Configuration/Resources/Models -I../../Source/Core/CommandPalette -I../../Source/Core/Midi -I../../Source/Core/Midi/Patterns -I../../Source/Core/Midi/Patterns/Modifiers -I../../Source/Core/Midi/Sequences -I../../Source/Core/Midi/Sequences/Events -I../../Source/Core/Network -I../../Source/Core/Network/Models -I../../Source/Core/Network/Requests -I../../Source/Core/Network/Services -I../../Source/Core/Serialization -I../../Source/Core/Tree -I../../Source/Core/Undo -I../../Source/Core/Undo/Actions -I../../Source/Core/VCS -I../../Source/Core/VCS/DiffLogic -I../../Source/Core/Workspace -I../../Source/UI/ -I../../Source/UI/Common -I../../Source/UI/Dialogs -I../../Source/UI/Headline -I../../Source/UI/Input -I../../Source/UI/Menus -I../../Source/UI/Menus/Base -I../../Source/UI/Menus/SelectionMenus -I../../Source/UI/Pages/Instruments -I../../Source/UI/Pages/Instruments/Editor -I../../Source/UI/Pages/Project -I../../Source/UI/Pages/Settings -I../../Source/UI/Pages/VCS -I../../Source/UI/Pages/Dashboard -I../../Source/UI/Popups -I../../Source/UI/Sequencer -I../../Source/UI/Sequencer/EditorPanels -I../../Source/UI/Sequencer/EditorPanels/AutomationEditor -I../../Source/UI/Sequencer/EditorPanels/VelocityEditor -I../../Source/UI/Sequencer/Header -I../../Source/UI/Sequencer/Helpers -I../../Source/UI/Sequencer/MiniMaps -I../../Source/UI/Sequencer/MiniMaps/AnnotationsMap -I../../Source/UI/Sequencer/MiniMaps/KeySignaturesMap -I../../Source/UI/Sequencer/MiniMaps/PianoMap -I../../Source/UI/Sequencer/MiniMaps/TimeSignaturesMap -I../../Source/UI/Sequencer/PatternRoll -I../../Source/UI/Sequencer/PianoRoll -I../../Source/UI/Sequencer/Sidebars -I../../Source/UI/Themes $(CPPFLAGS)
  24. JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0"
  25. JUCE_TARGET_APP := helio
  26. JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -fpermissive -Wno-unknown-pragmas -Wno-reorder -Wno-dynamic-class-memaccess $(CFLAGS)
  27. - JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++14 $(CXXFLAGS)
  28. - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl) -fvisibility=hidden -lrt -ldl -lpthread -lGL $(LDFLAGS)
  29. + JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++17 $(CXXFLAGS)
  30. + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2) -fvisibility=hidden -lrt -ldl -lpthread -lGL $(LDFLAGS)
  31. CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR)
  32. endif
  33. @@ -77,13 +77,13 @@ ifeq ($(CONFIG),Release32)
  34. TARGET_ARCH := -m32
  35. endif
  36. - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_B650AE49=1" "-DJUCE_APP_VERSION=3.16" "-DJUCE_APP_VERSION_HEX=0x31000" $(shell pkg-config --cflags alsa freetype2 libcurl) -pthread -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../ThirdParty/ASIO/common -I../../Source/ -I../../Source/Core -I../../Source/Core/Audio -I../../Source/Core/Audio/BuiltIn -I../../Source/Core/Audio/BuiltIn/SoundFont -I../../Source/Core/Audio/Instruments -I../../Source/Core/Audio/Transport -I../../Source/Core/Configuration -I../../Source/Core/Configuration/Resources -I../../Source/Core/Configuration/Resources/Models -I../../Source/Core/CommandPalette -I../../Source/Core/Midi -I../../Source/Core/Midi/Patterns -I../../Source/Core/Midi/Patterns/Modifiers -I../../Source/Core/Midi/Sequences -I../../Source/Core/Midi/Sequences/Events -I../../Source/Core/Network -I../../Source/Core/Network/Models -I../../Source/Core/Network/Requests -I../../Source/Core/Network/Services -I../../Source/Core/Serialization -I../../Source/Core/Tree -I../../Source/Core/Undo -I../../Source/Core/Undo/Actions -I../../Source/Core/VCS -I../../Source/Core/VCS/DiffLogic -I../../Source/Core/Workspace -I../../Source/UI/ -I../../Source/UI/Common -I../../Source/UI/Dialogs -I../../Source/UI/Headline -I../../Source/UI/Input -I../../Source/UI/Menus -I../../Source/UI/Menus/Base -I../../Source/UI/Menus/SelectionMenus -I../../Source/UI/Pages/Instruments -I../../Source/UI/Pages/Instruments/Editor -I../../Source/UI/Pages/Project -I../../Source/UI/Pages/Settings -I../../Source/UI/Pages/VCS -I../../Source/UI/Pages/Dashboard -I../../Source/UI/Popups -I../../Source/UI/Sequencer -I../../Source/UI/Sequencer/EditorPanels -I../../Source/UI/Sequencer/EditorPanels/AutomationEditor -I../../Source/UI/Sequencer/EditorPanels/VelocityEditor -I../../Source/UI/Sequencer/Header -I../../Source/UI/Sequencer/Helpers -I../../Source/UI/Sequencer/MiniMaps -I../../Source/UI/Sequencer/MiniMaps/AnnotationsMap -I../../Source/UI/Sequencer/MiniMaps/KeySignaturesMap -I../../Source/UI/Sequencer/MiniMaps/PianoMap -I../../Source/UI/Sequencer/MiniMaps/TimeSignaturesMap -I../../Source/UI/Sequencer/PatternRoll -I../../Source/UI/Sequencer/PianoRoll -I../../Source/UI/Sequencer/Sidebars -I../../Source/UI/Themes $(CPPFLAGS)
  37. + JUCE_CPPFLAGS := $(DEPFLAGS) "-DNO_NETWORK" "-DJUCE_USE_CURL=0" "-DJUCE_MODAL_LOOPS_PERMITTED=1" "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_B650AE49=1" "-DJUCE_APP_VERSION=3.16" "-DJUCE_APP_VERSION_HEX=0x31000" $(shell pkg-config --cflags alsa freetype2) -pthread -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../ThirdParty/ASIO/common -I../../Source/ -I../../Source/Core -I../../Source/Core/Audio -I../../Source/Core/Audio/BuiltIn -I../../Source/Core/Audio/BuiltIn/SoundFont -I../../Source/Core/Audio/Instruments -I../../Source/Core/Audio/Transport -I../../Source/Core/Configuration -I../../Source/Core/Configuration/Resources -I../../Source/Core/Configuration/Resources/Models -I../../Source/Core/CommandPalette -I../../Source/Core/Midi -I../../Source/Core/Midi/Patterns -I../../Source/Core/Midi/Patterns/Modifiers -I../../Source/Core/Midi/Sequences -I../../Source/Core/Midi/Sequences/Events -I../../Source/Core/Network -I../../Source/Core/Network/Models -I../../Source/Core/Network/Requests -I../../Source/Core/Network/Services -I../../Source/Core/Serialization -I../../Source/Core/Tree -I../../Source/Core/Undo -I../../Source/Core/Undo/Actions -I../../Source/Core/VCS -I../../Source/Core/VCS/DiffLogic -I../../Source/Core/Workspace -I../../Source/UI/ -I../../Source/UI/Common -I../../Source/UI/Dialogs -I../../Source/UI/Headline -I../../Source/UI/Input -I../../Source/UI/Menus -I../../Source/UI/Menus/Base -I../../Source/UI/Menus/SelectionMenus -I../../Source/UI/Pages/Instruments -I../../Source/UI/Pages/Instruments/Editor -I../../Source/UI/Pages/Project -I../../Source/UI/Pages/Settings -I../../Source/UI/Pages/VCS -I../../Source/UI/Pages/Dashboard -I../../Source/UI/Popups -I../../Source/UI/Sequencer -I../../Source/UI/Sequencer/EditorPanels -I../../Source/UI/Sequencer/EditorPanels/AutomationEditor -I../../Source/UI/Sequencer/EditorPanels/VelocityEditor -I../../Source/UI/Sequencer/Header -I../../Source/UI/Sequencer/Helpers -I../../Source/UI/Sequencer/MiniMaps -I../../Source/UI/Sequencer/MiniMaps/AnnotationsMap -I../../Source/UI/Sequencer/MiniMaps/KeySignaturesMap -I../../Source/UI/Sequencer/MiniMaps/PianoMap -I../../Source/UI/Sequencer/MiniMaps/TimeSignaturesMap -I../../Source/UI/Sequencer/PatternRoll -I../../Source/UI/Sequencer/PianoRoll -I../../Source/UI/Sequencer/Sidebars -I../../Source/UI/Themes $(CPPFLAGS)
  38. JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0"
  39. JUCE_TARGET_APP := helio
  40. JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -flto -fpermissive -Wno-unknown-pragmas -Wno-reorder -Wno-dynamic-class-memaccess $(CFLAGS)
  41. - JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++14 $(CXXFLAGS)
  42. - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl) -fvisibility=hidden -flto -lrt -ldl -lpthread -lGL $(LDFLAGS)
  43. + JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++17 $(CXXFLAGS)
  44. + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2) -fvisibility=hidden -flto -lrt -ldl -lpthread -lGL $(LDFLAGS)
  45. CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR)
  46. endif
  47. @@ -98,13 +98,13 @@ ifeq ($(CONFIG),Release64)
  48. TARGET_ARCH := -m64
  49. endif
  50. - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_B650AE49=1" "-DJUCE_APP_VERSION=3.16" "-DJUCE_APP_VERSION_HEX=0x31000" $(shell pkg-config --cflags alsa freetype2 libcurl) -pthread -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../ThirdParty/ASIO/common -I../../Source/ -I../../Source/Core -I../../Source/Core/Audio -I../../Source/Core/Audio/BuiltIn -I../../Source/Core/Audio/BuiltIn/SoundFont -I../../Source/Core/Audio/Instruments -I../../Source/Core/Audio/Transport -I../../Source/Core/Configuration -I../../Source/Core/Configuration/Resources -I../../Source/Core/Configuration/Resources/Models -I../../Source/Core/CommandPalette -I../../Source/Core/Midi -I../../Source/Core/Midi/Patterns -I../../Source/Core/Midi/Patterns/Modifiers -I../../Source/Core/Midi/Sequences -I../../Source/Core/Midi/Sequences/Events -I../../Source/Core/Network -I../../Source/Core/Network/Models -I../../Source/Core/Network/Requests -I../../Source/Core/Network/Services -I../../Source/Core/Serialization -I../../Source/Core/Tree -I../../Source/Core/Undo -I../../Source/Core/Undo/Actions -I../../Source/Core/VCS -I../../Source/Core/VCS/DiffLogic -I../../Source/Core/Workspace -I../../Source/UI/ -I../../Source/UI/Common -I../../Source/UI/Dialogs -I../../Source/UI/Headline -I../../Source/UI/Input -I../../Source/UI/Menus -I../../Source/UI/Menus/Base -I../../Source/UI/Menus/SelectionMenus -I../../Source/UI/Pages/Instruments -I../../Source/UI/Pages/Instruments/Editor -I../../Source/UI/Pages/Project -I../../Source/UI/Pages/Settings -I../../Source/UI/Pages/VCS -I../../Source/UI/Pages/Dashboard -I../../Source/UI/Popups -I../../Source/UI/Sequencer -I../../Source/UI/Sequencer/EditorPanels -I../../Source/UI/Sequencer/EditorPanels/AutomationEditor -I../../Source/UI/Sequencer/EditorPanels/VelocityEditor -I../../Source/UI/Sequencer/Header -I../../Source/UI/Sequencer/Helpers -I../../Source/UI/Sequencer/MiniMaps -I../../Source/UI/Sequencer/MiniMaps/AnnotationsMap -I../../Source/UI/Sequencer/MiniMaps/KeySignaturesMap -I../../Source/UI/Sequencer/MiniMaps/PianoMap -I../../Source/UI/Sequencer/MiniMaps/TimeSignaturesMap -I../../Source/UI/Sequencer/PatternRoll -I../../Source/UI/Sequencer/PianoRoll -I../../Source/UI/Sequencer/Sidebars -I../../Source/UI/Themes $(CPPFLAGS)
  51. + JUCE_CPPFLAGS := $(DEPFLAGS) "-DNO_NETWORK" "-DJUCE_USE_CURL=0" "-DJUCE_MODAL_LOOPS_PERMITTED=1" "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_B650AE49=1" "-DJUCE_APP_VERSION=3.16" "-DJUCE_APP_VERSION_HEX=0x31000" $(shell pkg-config --cflags alsa freetype2) -pthread -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../ThirdParty/ASIO/common -I../../Source/ -I../../Source/Core -I../../Source/Core/Audio -I../../Source/Core/Audio/BuiltIn -I../../Source/Core/Audio/BuiltIn/SoundFont -I../../Source/Core/Audio/Instruments -I../../Source/Core/Audio/Transport -I../../Source/Core/Configuration -I../../Source/Core/Configuration/Resources -I../../Source/Core/Configuration/Resources/Models -I../../Source/Core/CommandPalette -I../../Source/Core/Midi -I../../Source/Core/Midi/Patterns -I../../Source/Core/Midi/Patterns/Modifiers -I../../Source/Core/Midi/Sequences -I../../Source/Core/Midi/Sequences/Events -I../../Source/Core/Network -I../../Source/Core/Network/Models -I../../Source/Core/Network/Requests -I../../Source/Core/Network/Services -I../../Source/Core/Serialization -I../../Source/Core/Tree -I../../Source/Core/Undo -I../../Source/Core/Undo/Actions -I../../Source/Core/VCS -I../../Source/Core/VCS/DiffLogic -I../../Source/Core/Workspace -I../../Source/UI/ -I../../Source/UI/Common -I../../Source/UI/Dialogs -I../../Source/UI/Headline -I../../Source/UI/Input -I../../Source/UI/Menus -I../../Source/UI/Menus/Base -I../../Source/UI/Menus/SelectionMenus -I../../Source/UI/Pages/Instruments -I../../Source/UI/Pages/Instruments/Editor -I../../Source/UI/Pages/Project -I../../Source/UI/Pages/Settings -I../../Source/UI/Pages/VCS -I../../Source/UI/Pages/Dashboard -I../../Source/UI/Popups -I../../Source/UI/Sequencer -I../../Source/UI/Sequencer/EditorPanels -I../../Source/UI/Sequencer/EditorPanels/AutomationEditor -I../../Source/UI/Sequencer/EditorPanels/VelocityEditor -I../../Source/UI/Sequencer/Header -I../../Source/UI/Sequencer/Helpers -I../../Source/UI/Sequencer/MiniMaps -I../../Source/UI/Sequencer/MiniMaps/AnnotationsMap -I../../Source/UI/Sequencer/MiniMaps/KeySignaturesMap -I../../Source/UI/Sequencer/MiniMaps/PianoMap -I../../Source/UI/Sequencer/MiniMaps/TimeSignaturesMap -I../../Source/UI/Sequencer/PatternRoll -I../../Source/UI/Sequencer/PianoRoll -I../../Source/UI/Sequencer/Sidebars -I../../Source/UI/Themes $(CPPFLAGS)
  52. JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0"
  53. JUCE_TARGET_APP := helio
  54. JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -flto -fpermissive -Wno-unknown-pragmas -Wno-reorder -Wno-dynamic-class-memaccess $(CFLAGS)
  55. - JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++14 $(CXXFLAGS)
  56. - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl) -fvisibility=hidden -flto -lrt -ldl -lpthread -lGL $(LDFLAGS)
  57. + JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++17 $(CXXFLAGS)
  58. + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2) -fvisibility=hidden -flto -lrt -ldl -lpthread -lGL $(LDFLAGS)
  59. CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR)
  60. endif
  61. @@ -132,7 +132,7 @@ all : $(JUCE_OUTDIR)/$(JUCE_TARGET_APP)
  62. $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(RESOURCES)
  63. @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
  64. - @pkg-config --print-errors alsa freetype2 libcurl
  65. + @pkg-config --print-errors alsa freetype2
  66. @echo Linking "Helio - App"
  67. -$(V_AT)mkdir -p $(JUCE_BINDIR)
  68. -$(V_AT)mkdir -p $(JUCE_LIBDIR)
  69. diff --git a/Source/Core/Audio/AudioMonitor.cpp b/Source/Core/Audio/AudioMonitor.cpp
  70. index a590ada..1dbccca 100644
  71. --- a/Source/Core/Audio/AudioMonitor.cpp
  72. +++ b/Source/Core/Audio/AudioMonitor.cpp
  73. @@ -74,8 +74,12 @@ void AudioMonitor::audioDeviceAboutToStart(AudioIODevice *device)
  74. this->sampleRate = device->getCurrentSampleRate();
  75. }
  76. -void AudioMonitor::audioDeviceIOCallback(const float **inputChannelData, int numInputChannels,
  77. - float **outputChannelData, int numOutputChannels, int numSamples)
  78. +void AudioMonitor::audioDeviceIOCallbackWithContext(const float* const* inputChannelData,
  79. + int numInputChannels,
  80. + float* const* outputChannelData,
  81. + int numOutputChannels,
  82. + int numSamples,
  83. + const AudioIODeviceCallbackContext&)
  84. {
  85. const int minNumChannels = jmin(AudioMonitor::numChannels, numOutputChannels);
  86. diff --git a/Source/Core/Audio/AudioMonitor.h b/Source/Core/Audio/AudioMonitor.h
  87. index 52586c3..73f80fe 100644
  88. --- a/Source/Core/Audio/AudioMonitor.h
  89. +++ b/Source/Core/Audio/AudioMonitor.h
  90. @@ -28,8 +28,7 @@ public:
  91. //===------------------------------------------------------------------===//
  92. void audioDeviceAboutToStart(AudioIODevice *device) override;
  93. - void audioDeviceIOCallback(const float **inputChannelData, int numInputChannels,
  94. - float **outputChannelData, int numOutputChannels, int numSamples) override;
  95. + void audioDeviceIOCallbackWithContext(const float* const*, int, float* const*, int, int, const AudioIODeviceCallbackContext&) override;
  96. void audioDeviceStopped() override {}
  97. //===------------------------------------------------------------------===//
  98. diff --git a/Source/Core/Audio/Instruments/Instrument.cpp b/Source/Core/Audio/Instruments/Instrument.cpp
  99. index 920ea86..c27cd60 100644
  100. --- a/Source/Core/Audio/Instruments/Instrument.cpp
  101. +++ b/Source/Core/Audio/Instruments/Instrument.cpp
  102. @@ -928,9 +928,12 @@ void Instrument::AudioCallback::setProcessor(AudioProcessor *const newOne)
  103. }
  104. }
  105. -void Instrument::AudioCallback::audioDeviceIOCallback(const float** const inputChannelData,
  106. - const int numInputChannels, float **const outputChannelData,
  107. - const int numOutputChannels, const int numSamples)
  108. +void Instrument::AudioCallback::audioDeviceIOCallbackWithContext(const float* const* inputChannelData,
  109. + int numInputChannels,
  110. + float* const* outputChannelData,
  111. + int numOutputChannels,
  112. + int numSamples,
  113. + const AudioIODeviceCallbackContext&)
  114. {
  115. jassert(this->sampleRate > 0 && this->blockSize > 0);
  116. diff --git a/Source/Core/Audio/Instruments/Instrument.h b/Source/Core/Audio/Instruments/Instrument.h
  117. index 2855a42..66d9437 100644
  118. --- a/Source/Core/Audio/Instruments/Instrument.h
  119. +++ b/Source/Core/Audio/Instruments/Instrument.h
  120. @@ -60,7 +60,7 @@ public:
  121. void setProcessor(AudioProcessor *processor);
  122. MidiMessageCollector &getMidiMessageCollector() noexcept { return messageCollector; }
  123. - void audioDeviceIOCallback(const float **, int, float **, int, int) override;
  124. + void audioDeviceIOCallbackWithContext(const float* const*, int, float* const*, int, int, const AudioIODeviceCallbackContext&) override;
  125. void audioDeviceAboutToStart(AudioIODevice *) override;
  126. void audioDeviceStopped() override;
  127. void handleIncomingMidiMessage(MidiInput *, const MidiMessage &) override;
  128. diff --git a/Source/Core/Audio/Instruments/PluginScanner.cpp b/Source/Core/Audio/Instruments/PluginScanner.cpp
  129. index 6f89425..ae4d488 100644
  130. --- a/Source/Core/Audio/Instruments/PluginScanner.cpp
  131. +++ b/Source/Core/Audio/Instruments/PluginScanner.cpp
  132. @@ -111,7 +111,7 @@ void PluginScanner::runInitialScan()
  133. if (!this->isThreadRunning())
  134. {
  135. - this->startThread(0);
  136. + this->startThread(Thread::Priority::background);
  137. }
  138. // prepare search paths, prepare specific files to scan,
  139. @@ -161,7 +161,7 @@ void PluginScanner::scanFolderAndAddResults(const File &dir)
  140. if (!this->isThreadRunning())
  141. {
  142. - this->startThread(0);
  143. + this->startThread(Thread::Priority::background);
  144. }
  145. // prepare search paths and resume search thread
  146. diff --git a/Source/Core/Audio/Transport/PlayerThread.cpp b/Source/Core/Audio/Transport/PlayerThread.cpp
  147. index c654c33..c3bbcb4 100644
  148. --- a/Source/Core/Audio/Transport/PlayerThread.cpp
  149. +++ b/Source/Core/Audio/Transport/PlayerThread.cpp
  150. @@ -38,7 +38,7 @@ void PlayerThread::startPlayback(Transport::PlaybackContext::Ptr context)
  151. this->sequences = this->transport.getPlaybackCache();
  152. this->speedMultiplier = 1.f;
  153. this->speedMultiplierChanged = false;
  154. - this->startThread(10);
  155. + this->startRealtimeThread({});
  156. }
  157. void PlayerThread::setSpeedMultiplier(float multiplier)
  158. diff --git a/Source/Core/Audio/Transport/RendererThread.cpp b/Source/Core/Audio/Transport/RendererThread.cpp
  159. index 5f54ea8..b8bb141 100644
  160. --- a/Source/Core/Audio/Transport/RendererThread.cpp
  161. +++ b/Source/Core/Audio/Transport/RendererThread.cpp
  162. @@ -95,7 +95,7 @@ bool RendererThread::startRendering(const URL &target, RenderFormat format,
  163. if (writer != nullptr)
  164. {
  165. DBG(this->renderTarget.getLocalFile().getFullPathName());
  166. - this->startThread(9);
  167. + this->startThread(Thread::Priority::highest);
  168. }
  169. return true;
  170. diff --git a/Source/Core/Network/Requests/AuthThread.h b/Source/Core/Network/Requests/AuthThread.h
  171. index a7d4ca4..556d3a8 100644
  172. --- a/Source/Core/Network/Requests/AuthThread.h
  173. +++ b/Source/Core/Network/Requests/AuthThread.h
  174. @@ -48,7 +48,7 @@ public:
  175. }
  176. this->provider = provider;
  177. - this->startThread(3);
  178. + this->startThread(Thread::Priority::low);
  179. }
  180. private:
  181. diff --git a/Source/Core/Network/Requests/BaseConfigSyncThread.h b/Source/Core/Network/Requests/BaseConfigSyncThread.h
  182. index e8b5815..dcf7147 100644
  183. --- a/Source/Core/Network/Requests/BaseConfigSyncThread.h
  184. +++ b/Source/Core/Network/Requests/BaseConfigSyncThread.h
  185. @@ -44,7 +44,7 @@ public:
  186. this->delay = delayMs;
  187. this->resourceType = resourceType;
  188. - this->startThread(3);
  189. + this->startThread(Thread::Priority::low);
  190. }
  191. private:
  192. diff --git a/Source/Core/Network/Requests/ProjectCloneThread.cpp b/Source/Core/Network/Requests/ProjectCloneThread.cpp
  193. index 519196e..1797cbb 100644
  194. --- a/Source/Core/Network/Requests/ProjectCloneThread.cpp
  195. +++ b/Source/Core/Network/Requests/ProjectCloneThread.cpp
  196. @@ -42,7 +42,7 @@ void ProjectCloneThread::doClone(WeakReference<VersionControl> vcs, const String
  197. this->vcs = vcs;
  198. this->projectId = projectId;
  199. - this->startThread(7);
  200. + this->startThread(Thread::Priority::high);
  201. }
  202. void ProjectCloneThread::run()
  203. diff --git a/Source/Core/Network/Requests/ProjectDeleteThread.cpp b/Source/Core/Network/Requests/ProjectDeleteThread.cpp
  204. index de0a7d5..c21615f 100644
  205. --- a/Source/Core/Network/Requests/ProjectDeleteThread.cpp
  206. +++ b/Source/Core/Network/Requests/ProjectDeleteThread.cpp
  207. @@ -41,7 +41,7 @@ void ProjectDeleteThread::doDelete(const String &projectId)
  208. }
  209. this->projectId = projectId;
  210. - this->startThread(9);
  211. + this->startThread(Thread::Priority::highest);
  212. }
  213. void ProjectDeleteThread::run()
  214. diff --git a/Source/Core/Network/Requests/RequestUserProfileThread.h b/Source/Core/Network/Requests/RequestUserProfileThread.h
  215. index b2a9582..4d85e0e 100644
  216. --- a/Source/Core/Network/Requests/RequestUserProfileThread.h
  217. +++ b/Source/Core/Network/Requests/RequestUserProfileThread.h
  218. @@ -46,7 +46,7 @@ public:
  219. }
  220. this->shouldFetchAvatar = fetchAvatarData;
  221. - this->startThread(3);
  222. + this->startThread(Thread::Priority::low);
  223. }
  224. private:
  225. diff --git a/Source/Core/Network/Requests/RevisionsSyncThread.cpp b/Source/Core/Network/Requests/RevisionsSyncThread.cpp
  226. index 4af4c70..8a7996b 100644
  227. --- a/Source/Core/Network/Requests/RevisionsSyncThread.cpp
  228. +++ b/Source/Core/Network/Requests/RevisionsSyncThread.cpp
  229. @@ -50,7 +50,7 @@ void RevisionsSyncThread::doFetch(WeakReference<VersionControl> vcs,
  230. this->vcs = vcs;
  231. this->idsToPull = {};
  232. this->idsToPush = {};
  233. - this->startThread(2); // bg fetching is a really low priority task
  234. + this->startThread(Thread::Priority::background); // bg fetching is a really low priority task
  235. }
  236. void RevisionsSyncThread::doSync(WeakReference<VersionControl> vcs,
  237. @@ -71,7 +71,7 @@ void RevisionsSyncThread::doSync(WeakReference<VersionControl> vcs,
  238. this->vcs = vcs;
  239. this->idsToPull = revisionIdsToPull;
  240. this->idsToPush = revisionIdsToPush;
  241. - this->startThread(7);
  242. + this->startThread(Thread::Priority::high);
  243. }
  244. void RevisionsSyncThread::run()
  245. diff --git a/Source/Core/Network/Requests/TokenUpdateThread.h b/Source/Core/Network/Requests/TokenUpdateThread.h
  246. index 5860cdc..a67cfc3 100644
  247. --- a/Source/Core/Network/Requests/TokenUpdateThread.h
  248. +++ b/Source/Core/Network/Requests/TokenUpdateThread.h
  249. @@ -44,7 +44,7 @@ public:
  250. }
  251. this->delay = delayMs;
  252. - this->startThread(3);
  253. + this->startThread(Thread::Priority::low);
  254. }
  255. private:
  256. diff --git a/Source/Core/Network/Requests/UpdatesCheckThread.h b/Source/Core/Network/Requests/UpdatesCheckThread.h
  257. index b4f0dfa..b68dba0 100644
  258. --- a/Source/Core/Network/Requests/UpdatesCheckThread.h
  259. +++ b/Source/Core/Network/Requests/UpdatesCheckThread.h
  260. @@ -53,7 +53,7 @@ public:
  261. }
  262. this->delay = delayMs;
  263. - this->startThread(3);
  264. + this->startThread(Thread::Priority::low);
  265. }
  266. private:
  267. diff --git a/Source/Core/Network/Services/ResourceSyncService.cpp b/Source/Core/Network/Services/ResourceSyncService.cpp
  268. index bfd465e..d6163db 100644
  269. --- a/Source/Core/Network/Services/ResourceSyncService.cpp
  270. +++ b/Source/Core/Network/Services/ResourceSyncService.cpp
  271. @@ -32,7 +32,7 @@ ResourceSyncService::ResourceSyncService() :
  272. synchronizer(this->prepareSyncThread())
  273. {
  274. this->prepareUpdatesCheckThread()->checkForUpdates(UPDATE_INFO_TIMEOUT_MS);
  275. - this->synchronizer->startThread(6);
  276. + this->synchronizer->startThread(Thread::Priority::high);
  277. // todo subscribe on user profile changes
  278. // detect resources missing locally
  279. diff --git a/Source/UI/Common/MetronomeEditor.h b/Source/UI/Common/MetronomeEditor.h
  280. index 9c913fe..3563713 100644
  281. --- a/Source/UI/Common/MetronomeEditor.h
  282. +++ b/Source/UI/Common/MetronomeEditor.h
  283. @@ -221,7 +221,7 @@ public:
  284. this->playButton->setPlaying(false);
  285. };
  286. - this->metronomePreviewThread->startThread(5);
  287. + this->metronomePreviewThread->startThread(Thread::Priority::normal);
  288. }
  289. else if (commandId == CommandIDs::TransportStop)
  290. {
  291. diff --git a/Source/UI/Dialogs/KeySignatureDialog.cpp b/Source/UI/Dialogs/KeySignatureDialog.cpp
  292. index 65d7117..83a31c0 100644
  293. --- a/Source/UI/Dialogs/KeySignatureDialog.cpp
  294. +++ b/Source/UI/Dialogs/KeySignatureDialog.cpp
  295. @@ -428,7 +428,7 @@ void KeySignatureDialog::handleCommandMessage(int commandId)
  296. this->playButton->setPlaying(false);
  297. };
  298. - this->scalePreviewThread->startThread(5);
  299. + this->scalePreviewThread->startThread(Thread::Priority::normal);
  300. }
  301. else if (commandId == CommandIDs::TransportStop)
  302. {
  303. diff --git a/Source/UI/Sequencer/MiniMaps/ProjectMapsScroller.cpp b/Source/UI/Sequencer/MiniMaps/ProjectMapsScroller.cpp
  304. index 3a7e099..446139e 100644
  305. --- a/Source/UI/Sequencer/MiniMaps/ProjectMapsScroller.cpp
  306. +++ b/Source/UI/Sequencer/MiniMaps/ProjectMapsScroller.cpp
  307. @@ -183,7 +183,7 @@ void ProjectMapsScroller::mouseDown(const MouseEvent &event)
  308. event.mods.isLeftButtonDown())
  309. {
  310. const auto mapBounds = this->getMapBounds();
  311. - this->drawingNewScreenRange = {
  312. + this->drawingNewScreenRange = Rectangle<float>{
  313. (event.position.x - mapBounds.getX()) / float(mapBounds.getWidth()),
  314. (event.position.y - mapBounds.getY()) / float(mapBounds.getHeight()), 0, 0 };