Skip to content

Commit

Permalink
- updated Loris toolbox to work with included Loris module
Browse files Browse the repository at this point in the history
  • Loading branch information
christoph-hart committed Mar 5, 2024
1 parent e0aff66 commit b6e4c9d
Show file tree
Hide file tree
Showing 159 changed files with 17 additions and 59,664 deletions.
9 changes: 5 additions & 4 deletions Loris Toolbox/Scripts/UI/BufferPreview.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ inline function rebuild(panel)

inline function make(name)
{
const var p = Content.getComponent("PreviewPanel");
local p = Content.getComponent("PreviewPanel");

p.data.paths = [];
p.data.channels = [];
Expand All @@ -131,6 +131,7 @@ inline function make(name)

if(event.clicked)
{

Engine.playBuffer(this.data.channels, function[this](isPlaying, pos)
{
this.data.previewPos = pos;
Expand Down Expand Up @@ -158,15 +159,15 @@ inline function make(name)
g.drawRect(b, 1);


for(p in this.data.paths)
for(tp in this.data.paths)
{
var pb = Rect.removeFromTop(b, this.get("height") / this.data.paths.length);

g.setColour(Colours.withAlpha(this.get("itemColour"), 0.1));

g.fillPath(p, pb);
g.fillPath(tp, pb);
g.setColour(0x5aFFFFFF);
g.drawPath(p, pb, 1.0);
g.drawPath(tp, pb, 1.0);
}

if(this.data.isPlaying)
Expand Down
9 changes: 7 additions & 2 deletions Loris Toolbox/project_info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<AdditionalDspLibraries value=""/>
<OSXStaticLibs value=""/>
<WindowsStaticLibFolder value=""/>
<ExtraDefinitionsWindows value="HISE_ENABLE_LORIS_ON_FRONTEND=1"/>
<ExtraDefinitionsOSX value="HISE_ENABLE_LORIS_ON_FRONTEND=1"/>
<ExtraDefinitionsWindows value=""/>
<ExtraDefinitionsOSX value=""/>
<ExtraDefinitionsIOS value=""/>
<ExtraDefinitionsLinux value="HISE_ENABLE_LORIS_ON_FRONTEND=1"/>
<AppGroupID value=""/>
Expand All @@ -36,4 +36,9 @@
<UseGlobalAppDataFolderWindows value="No"/>
<UseGlobalAppDataFolderMacOS value="No"/>
<DefaultUserPreset value=""/>
<VST3Category value=""/>
<OverwriteOldUserPresets value="No"/>
<CompileWithPerfetto value="No"/>
<CompileWithDebugSymbols value="No"/>
<IncludeLorisInFrontend value="1"/>
</ProjectSettings>
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
# loris-tools

[![Loris Library Build](https://github.com/christophhart/loris-tools/actions/workflows/build_library.yml/badge.svg)](https://github.com/christophhart/loris-tools/actions/workflows/build_library.yml)

A collection of sample analysis tools for HISE based on the Loris library. The [Loris library](http://www.cerlsoundgroup.org/Loris/) allows you resynthesize and morph audio data and is a pretty powerful tool. This repository contains the integration of Loris into [HISE](https://github.com/christophhart/HISE/)! The integration features:

- a prebuild dynamic library (currently only macOS, but Windows & Linux will follow soon)
- a scripting API to control loris functions using more or less the same API as the command line interface.
- integration into all file management tools in HISE: audio file loading, script Buffer support etc.

Expand All @@ -18,7 +15,7 @@ A HISE Project that demonstrates how to use the Loris library with the scripting

## loris_library

A dynamic library wrapper that encapsulated the calls into Loris through a C-only API interface. If you want to use Loris in HISE, just grab the latest build and put it in the HISE app data directory.
MOVED into hi_loris module

## loris_test

Expand Down
30 changes: 0 additions & 30 deletions build_library.bat

This file was deleted.

26 changes: 0 additions & 26 deletions build_library.sh

This file was deleted.

4 changes: 4 additions & 0 deletions loris_library/Readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
The Loris library was removed with HISE 4.0.0 and is now part of HISE. Just compile HISE with HISE_INCLUDE_LORIS enabled.

If you want to use Loris in a compiled plugin, enable the Project setting `IncludeLorisInFrontend`

110 changes: 0 additions & 110 deletions loris_library/Source/Helpers.cpp

This file was deleted.

Loading

0 comments on commit b6e4c9d

Please sign in to comment.