diff --git a/csdr/chain/dablin.py b/csdr/chain/dablin.py index 6b6c4e48..a322443d 100644 --- a/csdr/chain/dablin.py +++ b/csdr/chain/dablin.py @@ -62,10 +62,10 @@ class MetaProcessor(PickleModule): class Dablin(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain, HdAudio, MetaProvider, DabServiceSelector, DialFrequencyReceiver): def __init__(self): shift = Shift(0) - decoder = EtiDecoder() + self.decoder = EtiDecoder() metaBuffer = Buffer(Format.CHAR) - decoder.setMetaWriter(metaBuffer) + self.decoder.setMetaWriter(metaBuffer) self.processor = MetaProcessor(shift) self.processor.setReader(metaBuffer.getReader()) # use a dummy to start with. it won't run without. @@ -76,7 +76,7 @@ class Dablin(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain, workers = [ shift, - decoder, + self.decoder, self.dablin, Downmix(Format.FLOAT), ] @@ -101,6 +101,7 @@ class Dablin(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain, self.processor.setWriter(writer) def setDabServiceId(self, serviceId: int) -> None: + self.decoder.setServiceIdFilter([serviceId]) self.dablin.setDabServiceId(serviceId) def setDialFrequency(self, frequency: int) -> None: diff --git a/docker/scripts/install-owrx-tools.sh b/docker/scripts/install-owrx-tools.sh index b52628ad..763bb357 100755 --- a/docker/scripts/install-owrx-tools.sh +++ b/docker/scripts/install-owrx-tools.sh @@ -44,13 +44,13 @@ cd .. rm -rf pycsdr git clone https://github.com/jketterl/csdr-eti.git -# latest develop as of 2024-01-26 (global variables fix) -cmakebuild csdr-eti 9f2360e7ab080d3a9da5e04978c260cc911c06ca +# latest develop as of 2024-02-12 (service id filter) +cmakebuild csdr-eti e09823e188bc8a9918fb38f4ffe17e131ef2dee3 git clone https://github.com/jketterl/pycsdr-eti.git cd pycsdr-eti -# latest develop as of 2024-01-26 (initial integration) -git checkout ebc29af1eb7c0be7532c91cf459f064dcb017455 +# latest develop as of 2024-02-12 (service id filter) +git checkout 676663b4d796fbadd18dfcae0c3b80eb1b1f9147 ./setup.py install cd .. rm -rf pycsdr-eti