diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-06-12 07:42:22 +0200 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-06-12 07:42:22 +0200 |
commit | fed9a724ca91417e84071255890ec26ff797fd4f (patch) | |
tree | e20a2f1ddcf4e18acf1fcc5790507a2b515d1ff9 /src/EtiReader.cpp | |
parent | 5e5c0871db3069958ae072c5a367c4467f261d3e (diff) | |
download | dabmod-fed9a724ca91417e84071255890ec26ff797fd4f.tar.gz dabmod-fed9a724ca91417e84071255890ec26ff797fd4f.tar.bz2 dabmod-fed9a724ca91417e84071255890ec26ff797fd4f.zip |
Simplify TIST offset handling, add offset to RC
This breaks old configuration files using synchronous=1
Diffstat (limited to 'src/EtiReader.cpp')
-rw-r--r-- | src/EtiReader.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/EtiReader.cpp b/src/EtiReader.cpp index 100fbdb..2f088d5 100644 --- a/src/EtiReader.cpp +++ b/src/EtiReader.cpp @@ -51,13 +51,16 @@ enum ETI_READER_STATE { }; -EtiReader::EtiReader(struct modulator_offset_config& modconf) : +EtiReader::EtiReader(double tist_offset_s, unsigned tist_delay_stages, + RemoteControllers* rcs) : state(EtiReaderStateSync), myFicSource(NULL), - myTimestampDecoder(modconf) + myTimestampDecoder(tist_offset_s, tist_delay_stages) { PDEBUG("EtiReader::EtiReader()\n"); + myTimestampDecoder.enrol_at(*rcs); + myCurrentFrame = 0; eti_fc_valid = false; } @@ -284,11 +287,6 @@ int EtiReader::process(const Buffer* dataIn) myTimestampDecoder.updateTimestampEti(eti_fc.FP & 0x3, eti_eoh.MNSC, getPPSOffset(), eti_fc.FCT); - if (eti_fc.FCT % 125 == 0) //every 3 seconds is fine enough - { - myTimestampDecoder.updateModulatorOffset(); - } - return dataIn->getLength() - input_size; } |