Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc #205

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Misc #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9cad6be
Set HISE_SCRIPT_SERVER_TIMEOUT to a more respectable value
ustk Sep 1, 2021
267c5a3
Merge branch 'develop' of https://github.com/ustk/HISE into develop
ustk Sep 1, 2021
0307d8e
Merge branch 'christophhart:develop' into develop
ustk Sep 3, 2021
5163a09
Merge branch 'christophhart:develop' into develop
ustk Sep 5, 2021
6bc61b4
Merge branch 'christophhart:develop' into develop
ustk Sep 6, 2021
8ceb10b
Extend HISE_SCRIPT_SERVER_TIMEOUT
ustk Sep 22, 2021
894eaa1
Fix sampleRateSelector was declared twice in Audio Settings
ustk Sep 22, 2021
edca590
Remove mouse drag threshold
ustk Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion hi_components/plugin_components/StandalonePopupComponents.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ CustomSettingsWindow::CustomSettingsWindow(MainController* mc_, bool buildMenus)
addAndMakeVisible(deviceSelector = new ComboBox("Driver"));
addAndMakeVisible(soundCardSelector = new ComboBox("Device"));
addAndMakeVisible(outputSelector = new ComboBox("Output"));
addAndMakeVisible(sampleRateSelector = new ComboBox("Sample Rate"));
addAndMakeVisible(bufferSelector = new ComboBox("Buffer Sizes"));
addAndMakeVisible(sampleRateSelector = new ComboBox("Sample Rate"));

Expand Down
2 changes: 1 addition & 1 deletion hi_core/hi_core/MiscComponents.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ void MouseCallbackComponent::sendMessage(const MouseEvent &event, Action action,
const bool isIn = getLocalBounds().contains(event.position.toInt());

e->setProperty(insideDrag, isIn ? 1: 0);
e->setProperty(drag, event.getDistanceFromDragStart() > 4);
e->setProperty(drag, event.getDistanceFromDragStart() > 0);
e->setProperty(dragX, event.getDistanceFromDragStartX());
e->setProperty(dragY, event.getDistanceFromDragStartY());
}
Expand Down
2 changes: 1 addition & 1 deletion hi_scripting/hi_scripting.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ compile / debug cycle and don't need all nodes in scriptnode you might want to t

/** This will determine the timeout duration (in milliseconds) after which a server call will be aborted. */
#ifndef HISE_SCRIPT_SERVER_TIMEOUT
#define HISE_SCRIPT_SERVER_TIMEOUT 10000
#define HISE_SCRIPT_SERVER_TIMEOUT 20000
#endif

#define MAX_SCRIPT_HEIGHT 700
Expand Down
6 changes: 3 additions & 3 deletions projects/standalone/HISE Standalone.jucer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<XCODE_MAC targetFolder="Builds/MacOSX" smallIcon="ho3qQy" bigIcon="ho3qQy"
extraLinkerFlags="/opt/intel/ipp/lib/libippi.a /opt/intel/ipp/lib/libipps.a /opt/intel/ipp/lib/libippvm.a /opt/intel/ipp/lib/libippcore.a"
customPList="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;!DOCTYPE plist PUBLIC &quot;-//Apple//DTD PLIST 1.0//EN&quot; &quot;http://www.apple.com/DTDs/PropertyList-1.0.dtd&quot;&gt;&#10;&lt;plist version=&quot;1.0&quot;&gt;&#10;&lt;dict&gt;&#10;&lt;key&gt;NSAppTransportSecurity&lt;/key&gt; &#10;&lt;dict&gt; &#10;&lt;key&gt;NSAllowsArbitraryLoads&lt;/key&gt;&lt;true/&gt;&#10;&lt;/dict&gt;&#10;&lt;/dict&gt;&#10;&lt;/plist&gt;"
extraDefs="USE_IPP=1&#10;HI_ENABLE_EXPANSION_EDITING=1&#10;HISE_ENABLE_EXPANSIONS=1"
extraDefs="USE_IPP=1&#10;HI_ENABLE_EXPANSION_EDITING=1&#10;HISE_ENABLE_EXPANSIONS=1&#10;HISE_SCRIPT_SERVER_TIMEOUT=20000"
extraCompilerFlags="-Wno-reorder -Wno-inconsistent-missing-override -mpopcnt">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" osxCompatibility="10.7 SDK" osxArchitecture="64BitIntel"
Expand Down Expand Up @@ -141,7 +141,7 @@
</XCODE_IPHONE>
<VS2017 targetFolder="Builds/VisualStudio2017" smallIcon="ho3qQy" bigIcon="ho3qQy"
useIPP="Sequential" IPPLibrary="Sequential" windowsTargetPlatformVersion="10.0.16299.0"
extraDefs="USE_IPP=1&#10;HI_ENABLE_EXPANSION_EDITING=1&#10;HISE_ENABLE_EXPANSIONS=1"
extraDefs="USE_IPP=1&#10;HI_ENABLE_EXPANSION_EDITING=1&#10;HISE_ENABLE_EXPANSIONS=1&#10;HISE_SCRIPT_SERVER_TIMEOUT=20000"
extraCompilerFlags="/bigobj">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" winWarningLevel="4" generateManifest="1" winArchitecture="32-bit"
Expand Down Expand Up @@ -203,7 +203,7 @@
<MODULEPATH id="hi_snex" path="../../"/>
</MODULEPATHS>
</VS2017>
<LINUX_MAKE targetFolder="Builds/LinuxMakefile" extraDefs="USE_IPP=1&#10;HI_ENABLE_EXPANSION_EDITING=1&#10;HISE_ENABLE_EXPANSIONS=1&#10;"
<LINUX_MAKE targetFolder="Builds/LinuxMakefile" extraDefs="USE_IPP=1&#10;HI_ENABLE_EXPANSION_EDITING=1&#10;HISE_ENABLE_EXPANSIONS=1&#10;HISE_SCRIPT_SERVER_TIMEOUT=20000&#10;"
smallIcon="bfBEgJ" bigIcon="bfBEgJ" extraCompilerFlags="-Wno-reorder -Wno-inconsistent-missing-override"
linuxExtraPkgConfig="x11 xinerama xext" extraLinkerFlags="-no-pie&#10;/opt/intel/ipp/lib/intel64/libippi.a &#10;/opt/intel/ipp/lib/intel64/libipps.a&#10;/opt/intel/ipp/lib/intel64/libippvm.a&#10;/opt/intel/ipp/lib/intel64/libippcore.a&#10;">
<CONFIGURATIONS>
Expand Down
22 changes: 21 additions & 1 deletion projects/standalone/JuceLibraryCode/AppConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,17 @@
#endif

#ifndef USE_VDSP_FFT
//#define USE_VDSP_FFT 0
//#define USE_VDSP_FFT 1
#endif

#ifndef FRONTEND_IS_PLUGIN
//#define FRONTEND_IS_PLUGIN 0
#endif

#ifndef PROCESS_SOUND_GENERATORS_IN_FX_PLUGIN
//#define PROCESS_SOUND_GENERATORS_IN_FX_PLUGIN 1
#endif

#ifndef FORCE_INPUT_CHANNELS
//#define FORCE_INPUT_CHANNELS 0
#endif
Expand Down Expand Up @@ -186,6 +190,10 @@
#define ENABLE_ALL_PEAK_METERS 1
#endif

#ifndef READ_ONLY_FACTORY_PRESETS
//#define READ_ONLY_FACTORY_PRESETS 0
#endif

#ifndef ENABLE_CONSOLE_OUTPUT
//#define ENABLE_CONSOLE_OUTPUT 1
#endif
Expand Down Expand Up @@ -285,6 +293,10 @@
//#define HISE_INCLUDE_SNEX 0
#endif

#ifndef SNEX_INCLUDE_MEMORY_ADDRESS_IN_DUMP
//#define SNEX_INCLUDE_MEMORY_ADDRESS_IN_DUMP 0
#endif

//==============================================================================
// hi_streaming flags:

Expand All @@ -299,6 +311,14 @@
//#define HISE_NO_GUI_TOOLS 0
#endif

#ifndef HISE_USE_NEW_CODE_EDITOR
//#define HISE_USE_NEW_CODE_EDITOR 1
#endif

#ifndef IS_MARKDOWN_EDITOR
//#define IS_MARKDOWN_EDITOR 0
#endif

//==============================================================================
// juce_audio_devices flags:

Expand Down