From a2d731503fd26c02d35832bbc264babab9222f91 Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Sat, 2 Jan 2021 03:12:21 +0100 Subject: [PATCH] update api --- csdr/chain/__init__.py | 5 +++-- csdr/chain/fft.py | 2 +- csdr/csdr.py | 2 +- owrx/source/__init__.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/csdr/chain/__init__.py b/csdr/chain/__init__.py index 424d01f..4a7729a 100644 --- a/csdr/chain/__init__.py +++ b/csdr/chain/__init__.py @@ -1,10 +1,11 @@ -from pycsdr import Buffer +from pycsdr.modules import Buffer +from pycsdr.api import Flow import logging logger = logging.getLogger(__name__) -class Chain(object): +class Chain(Flow): def __init__(self, *workers): self.input = None self.output = None diff --git a/csdr/chain/fft.py b/csdr/chain/fft.py index 5813fc6..e709b04 100644 --- a/csdr/chain/fft.py +++ b/csdr/chain/fft.py @@ -1,5 +1,5 @@ from csdr.chain import Chain -from pycsdr import Fft, LogPower, LogAveragePower, FftExchangeSides, CompressFftAdpcm +from pycsdr.modules import Fft, LogPower, LogAveragePower, FftExchangeSides, CompressFftAdpcm import logging logger = logging.getLogger(__name__) diff --git a/csdr/csdr.py b/csdr/csdr.py index b95c10f..95dbbc1 100644 --- a/csdr/csdr.py +++ b/csdr/csdr.py @@ -36,7 +36,7 @@ from owrx.audio import AudioChopper from csdr.pipe import Pipe from csdr.chain.fft import FftChain -from pycsdr import Buffer +from pycsdr.modules import Buffer import logging diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py index 5822137..a8335c0 100644 --- a/owrx/source/__init__.py +++ b/owrx/source/__init__.py @@ -11,7 +11,7 @@ from owrx.command import CommandMapper from owrx.socket import getAvailablePort from owrx.property import PropertyStack, PropertyLayer -from pycsdr import SocketClient, Buffer +from pycsdr.modules import SocketClient, Buffer import logging