From 6655913cc32294d7e19ccf57b5fb5e6af77d531e Mon Sep 17 00:00:00 2001 From: Nils <> Date: Tue, 22 Mar 2022 22:31:40 +0100 Subject: [PATCH] adjust to new lss lib --- configure | 1 - engine/api.py | 5 +---- engine/auditioner.py | 4 +--- engine/config.py | 2 -- engine/instrument.py | 4 +--- engine/main.py | 4 +--- 6 files changed, 4 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 7ff83a5..4f27eff 100755 --- a/configure +++ b/configure @@ -1,6 +1,5 @@ #!/bin/bash program=tembro -cboxconfigure="--without-fluidsynth --without-libsmf" version=0.0.1 . template/configure.template #. is the posix compatible version of source diff --git a/engine/api.py b/engine/api.py index 9e9d12d..f03619c 100644 --- a/engine/api.py +++ b/engine/api.py @@ -26,11 +26,8 @@ import logging; logger = logging.getLogger(__name__); logger.info("import") from typing import List, Set, Dict, Tuple import atexit - -#Third Party Modules -from calfbox import cbox - #Template Modules +from template.calfbox import cbox import template.engine.api #we need direct access to the module to inject data in the provided structures. but we also need the functions directly. next line: from template.engine.api import * diff --git a/engine/auditioner.py b/engine/auditioner.py index 5a3c622..2ae799f 100644 --- a/engine/auditioner.py +++ b/engine/auditioner.py @@ -24,10 +24,8 @@ import logging; logger = logging.getLogger(__name__); logger.info("import") #Python Standard Lib -#Third Party -from calfbox import cbox - #Template Modules +from template.calfbox import cbox from template.engine.input_midi import MidiProcessor class Auditioner(object): diff --git a/engine/config.py b/engine/config.py index 3af69a2..a920e7a 100644 --- a/engine/config.py +++ b/engine/config.py @@ -60,6 +60,4 @@ Only "soft" settings, such as filters, can be changed dynamically and will be sa At the moment this software is in its ALPHA phase which means that samples libraries will still change.""", - - "dependencies" : "\n".join("* "+dep for dep in ()), } diff --git a/engine/instrument.py b/engine/instrument.py index ea0b467..12b1fd4 100644 --- a/engine/instrument.py +++ b/engine/instrument.py @@ -25,10 +25,8 @@ import logging; logger = logging.getLogger(__name__); logger.info("import") #Python Standard Lib import re -#Third Party -from calfbox import cbox - #Template Modules +from template.calfbox import cbox from template.engine.pitch import midiName2midiPitch #dict from template.engine.input_midi import MidiProcessor diff --git a/engine/main.py b/engine/main.py index 5f23e37..d2a28ce 100644 --- a/engine/main.py +++ b/engine/main.py @@ -28,10 +28,8 @@ import tarfile #from io import TextIOWrapper import mmap -#Third Party -from calfbox import cbox - #Template Modules +from template.calfbox import cbox from template.engine.data import Data as TemplateData from template.start import PATHS