diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-01-23 10:18:17 +0100 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-01-23 10:51:26 +0100 |
commit | e12c679b8cc8a263507c556cb24819dc0d5559b9 (patch) | |
tree | 8f2cd06710d15ca64a4a86c1ce52bc975ec3f2b0 /src/EtiReader.h | |
parent | d82422fbb3d9d34a0566197245376548ce3ef14e (diff) | |
parent | 94c1f63b6fd07d74f3325274dd19fd6beaf53965 (diff) | |
download | dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.tar.gz dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.tar.bz2 dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.zip |
Merge raspine's ZeroMQ RC and UHD staticdelay
Merge raspine/master pull request, fix indentation, code style, and two
minor conflicts in:
doc/example.ini
src/DabMod.cpp
Diffstat (limited to 'src/EtiReader.h')
-rw-r--r-- | src/EtiReader.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/EtiReader.h b/src/EtiReader.h index be12075..209b208 100644 --- a/src/EtiReader.h +++ b/src/EtiReader.h @@ -2,8 +2,10 @@ Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) - Includes modifications for which no copyright is claimed - 2012, Matthias P. Braendli, matthias.braendli@mpb.li + Copyright (C) 2014 + Matthias P. Braendli, matthias.braendli@mpb.li + + http://opendigitalradio.org */ /* This file is part of ODR-DabMod. @@ -60,9 +62,6 @@ public: myTimestampDecoder.calculateTimestamp(ts); } - /* Return the frame counter */ - uint32_t getFCT(); - /* Returns true if we have valid time stamps in the ETI*/ bool sourceContainsTimestamp(); |