diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-06-26 14:31:00 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-06-26 14:31:00 +0200 |
| commit | 79274de1247590c7f350d8e6aa1b67f9cc72ab08 (patch) | |
| tree | a73ec94995d377bf4bfe07255e5b0ce3cd653085 /src/EtiReader.cpp | |
| parent | 9021497ef780d5a586ec5757aff359693f0884ea (diff) | |
| parent | 5e5d45c6afe3f6cae696320acfdf6875324c994c (diff) | |
| download | dabmod-79274de1247590c7f350d8e6aa1b67f9cc72ab08.tar.gz dabmod-79274de1247590c7f350d8e6aa1b67f9cc72ab08.tar.bz2 dabmod-79274de1247590c7f350d8e6aa1b67f9cc72ab08.zip | |
Merge branch 'next' into tii
Diffstat (limited to 'src/EtiReader.cpp')
| -rw-r--r-- | src/EtiReader.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/EtiReader.cpp b/src/EtiReader.cpp index 100fbdb..f584275 100644 --- a/src/EtiReader.cpp +++ b/src/EtiReader.cpp @@ -51,13 +51,18 @@ 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 +289,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; } |