Browse Source

Remove some build noise.

tests
Ben Niemann 3 years ago
parent
commit
6539809850
  1. 18
      build_utils/waf/csound.py
  2. 2
      noisicaa/audioproc/audioproc.proto
  3. 109
      noisicaa/bindings/ladspa.pyx
  4. 8
      noisicaa/bindings/sndfile.pyx
  5. 1
      noisicaa/builtin_nodes/oscilloscope/processor.proto
  6. 1
      noisicaa/music/mutations.proto

18
build_utils/waf/csound.py

@ -21,9 +21,12 @@
# @end:license
import os.path
import subprocess
import sys
from waflib.Configure import conf
from waflib.Task import Task
from waflib import Utils
def configure(ctx):
@ -41,16 +44,21 @@ class compile_csound(Task):
ctx = self.generator.bld
cwd = ctx.srcnode
env = {
'LD_LIBRARY_PATH': os.path.join(ctx.env.VIRTUAL_ENV, 'lib'),
}
cmd = [
ctx.env.CSOUND[0],
'-o' + self.outputs[0].path_from(cwd),
self.inputs[0].path_from(cwd),
]
return self.exec_command(cmd, cwd=cwd, env=env)
kw = {
'cwd': cwd.abspath(),
'stdout': subprocess.PIPE,
'stderr': subprocess.STDOUT,
}
ctx.log_command(cmd, kw)
rc, out, _ = Utils.run_process(cmd, kw)
if rc:
sys.stderr.write(out.decode('utf-8'))
return rc
@conf

2
noisicaa/audioproc/audioproc.proto

@ -26,10 +26,8 @@ import "noisicaa/core/session_data.proto";
import "noisicaa/node_db/node_description.proto";
import "noisicaa/audioproc/public/backend_settings.proto";
import "noisicaa/audioproc/public/control_value.proto";
import "noisicaa/audioproc/public/host_parameters.proto";
import "noisicaa/audioproc/public/node_parameters.proto";
import "noisicaa/audioproc/public/node_port_properties.proto";
import "noisicaa/audioproc/public/player_state.proto";
import "noisicaa/audioproc/public/plugin_state.proto";
import "noisicaa/audioproc/public/processor_message.proto";
import "noisicaa/audioproc/public/project_properties.proto";

109
noisicaa/bindings/ladspa.pyx

@ -28,115 +28,6 @@ import sys
import numpy
cimport numpy
### DECLARATIONS ##########################################################
cdef extern from "dlfcn.h":
enum:
RTLD_LAZY
RTLD_NOW
RTLD_GLOBAL
RTLD_DEFAULT
RTLD_NEXT
void *dlopen(char *filename, int flag)
char *dlerror()
void *dlsym(void *handle, char *symbol)
int dlclose(void *handle)
cdef extern from "ladspa.h" nogil:
ctypedef float LADSPA_Data
ctypedef void* LADSPA_Handle
ctypedef int LADSPA_Properties
enum:
LADSPA_PROPERTY_REALTIME
LADSPA_PROPERTY_INPLACE_BROKEN
LADSPA_PROPERTY_HARD_RT_CAPABLE
int LADSPA_IS_REALTIME(int)
int LADSPA_IS_INPLACE_BROKEN(int)
int LADSPA_IS_HARD_RT_CAPABLE(int)
ctypedef int LADSPA_PortDescriptor
enum:
LADSPA_PORT_INPUT
LADSPA_PORT_OUTPUT
LADSPA_PORT_CONTROL
LADSPA_PORT_AUDIO
int LADSPA_IS_PORT_INPUT(int)
int LADSPA_IS_PORT_OUTPUT(int)
int LADSPA_IS_PORT_CONTROL(int)
int LADSPA_IS_PORT_AUDIO(int)
ctypedef int LADSPA_PortRangeHintDescriptor
enum:
LADSPA_HINT_BOUNDED_BELOW
LADSPA_HINT_BOUNDED_ABOVE
LADSPA_HINT_TOGGLED
LADSPA_HINT_SAMPLE_RATE
LADSPA_HINT_LOGARITHMIC
LADSPA_HINT_INTEGER
LADSPA_HINT_DEFAULT_MASK
LADSPA_HINT_DEFAULT_NONE
LADSPA_HINT_DEFAULT_MINIMUM
LADSPA_HINT_DEFAULT_LOW
LADSPA_HINT_DEFAULT_MIDDLE
LADSPA_HINT_DEFAULT_HIGH
LADSPA_HINT_DEFAULT_MAXIMUM
LADSPA_HINT_DEFAULT_0
LADSPA_HINT_DEFAULT_1
LADSPA_HINT_DEFAULT_100
LADSPA_HINT_DEFAULT_440
int LADSPA_IS_HINT_BOUNDED_BELOW(int)
int LADSPA_IS_HINT_BOUNDED_ABOVE(int)
int LADSPA_IS_HINT_TOGGLED(int)
int LADSPA_IS_HINT_SAMPLE_RATE(int)
int LADSPA_IS_HINT_LOGARITHMIC(int)
int LADSPA_IS_HINT_INTEGER(int)
int LADSPA_IS_HINT_HAS_DEFAULT(int)
int LADSPA_IS_HINT_DEFAULT_MINIMUM(int)
int LADSPA_IS_HINT_DEFAULT_LOW(int)
int LADSPA_IS_HINT_DEFAULT_MIDDLE(int)
int LADSPA_IS_HINT_DEFAULT_HIGH(int)
int LADSPA_IS_HINT_DEFAULT_MAXIMUM(int)
int LADSPA_IS_HINT_DEFAULT_0(int)
int LADSPA_IS_HINT_DEFAULT_1(int)
int LADSPA_IS_HINT_DEFAULT_100(int)
int LADSPA_IS_HINT_DEFAULT_440(int)
ctypedef struct LADSPA_PortRangeHint:
LADSPA_PortRangeHintDescriptor HintDescriptor
LADSPA_Data LowerBound
LADSPA_Data UpperBound
ctypedef struct LADSPA_Descriptor:
unsigned long UniqueID
char* Label
LADSPA_Properties Properties
char* Name
char* Maker
char* Copyright
unsigned long PortCount
LADSPA_PortDescriptor* PortDescriptors
char** PortNames
LADSPA_PortRangeHint* PortRangeHints
void* ImplementationData
LADSPA_Handle (*instantiate)(void* descriptor, int sample_rate)
void (*connect_port)(
LADSPA_Handle Instance, unsigned long port, LADSPA_Data* data_location)
void (*activate)(LADSPA_Handle Instance)
void (*run)(LADSPA_Handle instance, unsigned long sample_count)
void (*run_adding)(LADSPA_Handle instance, unsigned long sample_count)
void (*set_run_adding_gain)(LADSPA_Handle instance, LADSPA_Data gain)
void (*deactivate)(LADSPA_Handle instance)
void (*cleanup)(LADSPA_Handle instance)
LADSPA_Descriptor* ladspa_descriptor(unsigned long index)
ctypedef LADSPA_Descriptor* (*LADSPA_Descriptor_Function)(unsigned long index)
### CLIENT CODE ###########################################################
class Error(Exception):
pass

8
noisicaa/bindings/sndfile.pyx

@ -203,7 +203,7 @@ cdef extern from "sndfile.h":
ctypedef int64_t sf_count_t
cdef struct SF_INFO:
cdef struct _SF_INFO_s:
sf_count_t frames
int samplerate
int channels
@ -211,7 +211,7 @@ cdef extern from "sndfile.h":
int sections
int seekable
ctypedef SF_INFO SF_INFO
ctypedef _SF_INFO_s SF_INFO
cdef struct _SF_FORMAT_INFO_s:
int format
@ -302,14 +302,14 @@ cdef extern from "sndfile.h":
ctypedef sf_count_t (*sf_vio_tell)(void* user_data)
cdef struct SF_VIRTUAL_IO:
cdef struct _SF_VIRTUAL_IO_s:
sf_vio_get_filelen get_filelen
sf_vio_seek seek
sf_vio_read read
sf_vio_write write
sf_vio_tell tell
ctypedef SF_VIRTUAL_IO SF_VIRTUAL_IO
ctypedef _SF_VIRTUAL_IO_s SF_VIRTUAL_IO
SNDFILE* sf_open(char* path, int mode, SF_INFO* sfinfo)

1
noisicaa/builtin_nodes/oscilloscope/processor.proto

@ -25,7 +25,6 @@ syntax = "proto2";
package noisicaa.pb;
import "noisicaa/audioproc/public/node_parameters.proto";
import "noisicaa/audioproc/public/transfer_function.proto";
message OscilloscopeSpec {
required int32 foo = 1;

1
noisicaa/music/mutations.proto

@ -30,7 +30,6 @@ import "noisicaa/audioproc/public/plugin_state.proto";
import "noisicaa/audioproc/public/midi_event.proto";
import "noisicaa/node_db/node_description.proto";
import "noisicaa/music/model_base.proto";
import "noisicaa/music/model.proto";
package noisicaa.pb;

Loading…
Cancel
Save