csoundengine 2.22.7__tar.gz → 2.23.0__tar.gz

{csoundengine-2.22.7 → csoundengine-2.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csoundengine
-Version: 2.22.7
+Version: 2.23.0
 Summary: An audio synthesis framework using csound
 Author-email: Eduardo Moguillansky <eduardo.moguillansky@gmail.com>
 License: GNU GENERAL PUBLIC LICENSE
@@ -695,7 +695,7 @@ Requires-Dist: ipywidgets
 Requires-Dist: xxhash
 Requires-Dist: docstring_parser
 Requires-Dist: typing_extensions
-Requires-Dist: libcsound>=0.12.0
+Requires-Dist: libcsound>=0.16.1
 Requires-Dist: sndfileio>=2.1.1
 Requires-Dist: emlib>=1.20
 Requires-Dist: configdict>=2.10.0

{csoundengine-2.22.7 → csoundengine-2.23.0}/csoundengine/csoundlib.py

@@ -48,7 +48,9 @@ _cache: dict[str, Any] = {
 _audioDeviceRegex = r"(\d+):\s((?:adc|dac)\d+)\s*\((.*)\)(?:\s+\[ch:(\d+)\])?"
 
 
-def midiDevices(backend='portmidi') -> tuple[list[MidiDevice], list[MidiDevice]]:
+def midiDevices(backend='portmidi',
+                opcodedir=''
+                ) -> tuple[list[MidiDevice], list[MidiDevice]]:
     """
     Returns input and output midi devices for the given backend
 
@@ -71,7 +73,7 @@ def midiDevices(backend='portmidi') -> tuple[list[MidiDevice], list[MidiDevice]]
     ========   ===========================
     """
     import libcsound
-    csound = libcsound.Csound()
+    csound = libcsound.Csound(opcodeDir=opcodedir)
     csound.setOption(f"-+rtmidi={backend}")
     csound.setOption("-odac")
     csound.start()
@@ -146,7 +148,7 @@ class AudioBackend:
         indevices, outdevices = getAudioDevices(backend=self.name)
         return bool(indevices or outdevices)
 
-    def getSystemSr(self) -> int | None:
+    def getSystemSr(self, opcodedir='') -> int | None:
         """
         Get the system samplerate for this backend, if available
 
@@ -156,7 +158,7 @@ class AudioBackend:
             logger.debug(f"Backend {self.name} does not have a system sr, returning default")
             return 44100
         import libcsound
-        cs = libcsound.Csound()
+        cs = libcsound.Csound(opcodeDir=opcodedir)
         cs.setOption("-odac")
         cs.setOption(f"-+rtaudio={self.name}")
         ok = cs.start()
@@ -176,7 +178,8 @@ class AudioBackend:
     def audioDevices(self) -> tuple[list[AudioDevice], list[AudioDevice]]:
         return self.audioDevicesViaAPI()
 
-    def audioDevicesViaAPI(self) -> tuple[list[AudioDevice], list[AudioDevice]]:
+    def audioDevicesViaAPI(self, opcodedir=''
+                           ) -> tuple[list[AudioDevice], list[AudioDevice]]:
         """
         Query csound for audio devices for this backend
 
@@ -185,7 +188,7 @@ class AudioBackend:
         """
         logger.info(f"Querying csound's audio devices for backend {self.name}")
         import libcsound
-        cs = libcsound.Csound()
+        cs = libcsound.Csound(opcodeDir=opcodedir)
         cs.createMessageBuffer()
         for opt in ['-+rtaudio='+self.name, "-m16", "-odac", "--use-system-sr"]:
             cs.setOption(opt)
@@ -785,12 +788,10 @@ def installedOpcodes(cached=True, opcodedir: str = '') -> set[str]:
 def _csoundGetInfoViaAPI(opcodedir='') -> dict:
     global _cache
     import libcsound
-    cs = libcsound.Csound()
+    cs = libcsound.Csound(opcodeDir=opcodedir)
     cs.setOption("-d")
     cs.setOption("--nosound")
     cs.createMessageBuffer(echo=False)
-    if opcodedir:
-        cs.setOption(f'--opcode-dir={opcodedir}')
     version = cs.version()
     vs = str(version)
     patch = int(vs[-1])
@@ -808,23 +809,6 @@ def _csoundGetInfoViaAPI(opcodedir='') -> dict:
             'versionTriplet': versionTriplet}
 
 
-# def _opcodesList(opcodedir='') -> list[str]:
-#     options = ["-z"]
-#     if opcodedir:
-#         options.append(f'--opcode-dir={opcodedir}')
-#     s = csoundSubproc(options)
-#     assert s.stderr is not None
-#     lines = s.stderr.readlines()
-#     allopcodes = []
-#     for line in lines:
-#         if line.startswith(b"end of score"):
-#             break
-#         opcodes = line.decode('utf8').split()
-#         if opcodes:
-#             allopcodes.extend(opcodes)
-#     return allopcodes
-
-
 def saveAsGen23(data: Sequence[float] | np.ndarray,
                 outfile: str,
                 fmt="%.12f",

{csoundengine-2.22.7 → csoundengine-2.23.0}/csoundengine/dependencies.py

@@ -258,26 +258,11 @@ def installPlugins() -> bool:
         logger.error(f"Exception {e} while trying to install plugins via risset")
         return False
 
-    # logger.info("Installing plugins from distribution")
-    # try:
-    #     _installPluginsFromDist(apiversion=majorversion)
-    #     ok = pluginsInstalled(cached=False)
-    #     if ok:
-    #         logger.info("Plugins installed successfully from distribution")
-    #     else:
-    #         logger.error("Plugins where installed but do not seem to be detected")
-    # except Exception as e:
-    #     logger.error(f"Exception {e} while trying to install plugins from distribution")
-    #     return False
-    # return True
-
 
 def _checkDependencies(fix=False, quiet=False) -> str:
     """
     Returns an error message on failure, or an empty string on success
     """
-    if not csoundBinaryInPath():
-        logger.error("csound not found in the path. See https://csound.com/download.html. Some functionality might not be available")
     from . import csoundlib
     version = csoundlib.getVersion(useApi=True)
 

{csoundengine-2.22.7 → csoundengine-2.23.0}/csoundengine/engine.py

@@ -246,6 +246,16 @@ class Engine(_EngineBase):
         config. Default values can be configured via `config.edit()`, see
         `Configuration <https://csoundengine.readthedocs.io/en/latest/config.html>`_
 
+    .. note::
+
+        These env variables can customize the engine:
+
+        * LIBCSOUNDPATH: points to a valid libcsound dll. This can only be called once
+          within a session
+        * CSOUND7DIR64 / CSOUND6DIR64: path to the folder containing built-in plugins
+        * CS_USER_PLUGINDIR: path to the folder where user (external) plugins are placed
+
+
     Example
     -------
 
@@ -315,7 +325,8 @@ class Engine(_EngineBase):
                  busSupport=False,
                  nosound=False,
                  useProcessQueue=False,
-                 suppressVersion=True
+                 suppressVersion=True,
+                 opcodeDir=''
     ):
         import libcsound as lcs
         from . import csoundlib
@@ -549,7 +560,7 @@ class Engine(_EngineBase):
         self.udpPort = 0
         "UDP port used (0 if no udp port is active)"
 
-        self.csound: lcs.Csound = lcs.Csound()
+        self.csound: lcs.Csound = lcs.Csound(opcodeDir=opcodeDir)
         "The csound object"
 
         self.autosync: bool = autosync

{csoundengine-2.22.7 → csoundengine-2.23.0}/csoundengine/enginebase.py

@@ -62,13 +62,12 @@ class TableInfo:
 
 
 def _channelMode(kind: str) -> int:
-    import libcsound
     if kind == 'r':
-        return libcsound.CSOUND_INPUT_CHANNEL
+        return 16
     elif kind == 'w':
-        return libcsound.CSOUND_INPUT_CHANNEL
+        return 32
     elif kind == 'rw':
-        return libcsound.CSOUND_INPUT_CHANNEL | libcsound.CSOUND_OUTPUT_CHANNEL
+        return 16 | 32
     else:
         raise ValueError(f"Expected r, w or rw, got {kind}")
 

{csoundengine-2.22.7 → csoundengine-2.23.0}/csoundengine/offlineengine.py

@@ -176,6 +176,15 @@ class OfflineEngine(_EngineBase):
             If no encoding is given a suitable default for the sample format is chosen.
 
 
+    .. note::
+
+        These env variables can customize the engine:
+
+        * LIBCSOUNDPATH: points to a valid libcsound dll. This can only be called once
+          within a session
+        * CSOUND7DIR64 / CSOUND6DIR64: path to the folder containing built-in plugins
+        * CS_USER_PLUGINDIR: path to the folder where user (external) plugins are placed
+
     """
     def __init__(self,
                  sr=44100,
@@ -192,7 +201,8 @@ class OfflineEngine(_EngineBase):
                  sampleAccurate=False,
                  encoding='',
                  nosound=False,
-                 commandlineOptions: list[str] | None = None):
+                 commandlineOptions: list[str] | None = None,
+                 opcodeDir=''):
         super().__init__(sr=sr,
                          ksmps=ksmps,
                          a4=a4 or config['A4'],
@@ -250,6 +260,8 @@ class OfflineEngine(_EngineBase):
         if commandlineOptions:
             self.options.extend(commandlineOptions)
 
+        self._opcodeDir = opcodeDir
+
         self.csound: libcsound.Csound
 
         self._start()
@@ -277,7 +289,7 @@ class OfflineEngine(_EngineBase):
     def _start(self) -> None:
         import libcsound
         self.version = libcsound.VERSION
-        self.csound = csound = libcsound.Csound()
+        self.csound = csound = libcsound.Csound(opcodeDir=self._opcodeDir)
         for option in self.options:
             csound.setOption(option)
         if not self.nosound:

{csoundengine-2.22.7 → csoundengine-2.23.0}/csoundengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csoundengine
-Version: 2.22.7
+Version: 2.23.0
 Summary: An audio synthesis framework using csound
 Author-email: Eduardo Moguillansky <eduardo.moguillansky@gmail.com>
 License: GNU GENERAL PUBLIC LICENSE
@@ -695,7 +695,7 @@ Requires-Dist: ipywidgets
 Requires-Dist: xxhash
 Requires-Dist: docstring_parser
 Requires-Dist: typing_extensions
-Requires-Dist: libcsound>=0.12.0
+Requires-Dist: libcsound>=0.16.1
 Requires-Dist: sndfileio>=2.1.1
 Requires-Dist: emlib>=1.20
 Requires-Dist: configdict>=2.10.0

{csoundengine-2.22.7 → csoundengine-2.23.0}/csoundengine.egg-info/requires.txt

@@ -10,7 +10,7 @@ ipywidgets
 xxhash
 docstring_parser
 typing_extensions
-libcsound>=0.12.0
+libcsound>=0.16.1
 sndfileio>=2.1.1
 emlib>=1.20
 configdict>=2.10.0

{csoundengine-2.22.7 → csoundengine-2.23.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "csoundengine"
-version = "2.22.7"
+version = "2.23.0"
 license = { file = "LICENSE.txt" }
 description = "An audio synthesis framework using csound"
 authors = [
@@ -35,7 +35,7 @@ dependencies = [
     "docstring_parser",
     "typing_extensions",
 
-    "libcsound>=0.12.0",
+    "libcsound>=0.16.1",
     "sndfileio>=2.1.1",
     "emlib>=1.20",
     "configdict>=2.10.0",