use the new execmodule where appropriate

This commit is contained in:
Jakob Ketterl 2023-08-21 23:18:58 +02:00
parent 69d9a5ae79
commit 32fcfad4d5
5 changed files with 75 additions and 75 deletions

View file

@ -1,14 +1,11 @@
from csdr.module import PopenModule
from pycsdr.modules import ExecModule
from pycsdr.types import Format
class DrmModule(PopenModule):
def getInputFormat(self) -> Format:
return Format.COMPLEX_FLOAT
def getOutputFormat(self) -> Format:
return Format.SHORT
def getCommand(self):
# dream -c 6 --sigsrate 48000 --audsrate 48000 -I - -O -
return ["dream", "-c", "6", "--sigsrate", "48000", "--audsrate", "48000", "-I", "-", "-O", "-"]
class DrmModule(ExecModule):
def __init__(self):
super().__init__(
Format.COMPLEX_SHORT,
Format.SHORT,
["dream", "-c", "6", "--sigsrate", "48000", "--audsrate", "48000", "-I", "-", "-O", "-"]
)

View file

@ -1,13 +1,11 @@
from pycsdr.types import Format
from csdr.module import PopenModule
from pycsdr.modules import ExecModule
class FreeDVModule(PopenModule):
def getInputFormat(self) -> Format:
return Format.SHORT
def getOutputFormat(self) -> Format:
return Format.SHORT
def getCommand(self):
return ["freedv_rx", "1600", "-", "-"]
class FreeDVModule(ExecModule):
def __init__(self):
super().__init__(
Format.SHORT,
Format.SHORT,
["freedv_rx", "1600", "-", "-"]
)

View file

@ -1,5 +1,6 @@
from pycsdr.types import Format
from csdr.module import PopenModule, ThreadModule
from pycsdr.modules import ExecModule
from csdr.module import ThreadModule
from owrx.wsjt import WsjtParser, Msk144Profile
import pickle
@ -7,15 +8,13 @@ import logging
logger = logging.getLogger(__name__)
class Msk144Module(PopenModule):
def getCommand(self):
return ["msk144decoder"]
def getInputFormat(self) -> Format:
return Format.SHORT
def getOutputFormat(self) -> Format:
return Format.CHAR
class Msk144Module(ExecModule):
def __init__(self):
super().__init__(
Format.SHORT,
Format.CHAR,
["msk144decoder"]
)
class ParserAdapter(ThreadModule):