From f372d597739a30e0106aebc8225c1edebf6d93e3 Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Wed, 30 Oct 2013 22:25:45 +0100 Subject: Receive samplerate via metadata(), not start() --- decoders/i2s/pd.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'decoders/i2s/pd.py') diff --git a/decoders/i2s/pd.py b/decoders/i2s/pd.py index 9fbcef7..91d261a 100644 --- a/decoders/i2s/pd.py +++ b/decoders/i2s/pd.py @@ -58,6 +58,7 @@ class Decoder(srd.Decoder): ] def __init__(self, **kwargs): + self.samplerate = None self.oldsck = 1 self.oldws = 1 self.bitcount = 0 @@ -67,11 +68,14 @@ class Decoder(srd.Decoder): self.start_sample = None self.wordlength = -1 - def start(self, metadata): - self.samplerate = metadata['samplerate'] + def start(self): self.out_proto = self.add(srd.OUTPUT_PROTO, 'i2s') self.out_ann = self.add(srd.OUTPUT_ANN, 'i2s') + def metadata(self, key, value): + if key == srd.SRD_CONF_SAMPLERATE: + self.samplerate = value + def putpb(self, data): self.put(self.start_sample, self.samplenum, self.out_proto, data) @@ -93,6 +97,8 @@ class Decoder(srd.Decoder): (self.samplesreceived, self.wordlength, samplerate) def decode(self, ss, es, data): + if self.samplerate is None: + raise Exception("Cannot decode without samplerate.") for self.samplenum, (sck, ws, sd) in data: # Ignore sample if the bit clock hasn't changed. -- cgit v1.2.3-70-g09d2