diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-06-03 17:38:02 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-06-03 17:38:02 +0200 |
| commit | 23ad47277e73348bca32226d87274541e56bbebb (patch) | |
| tree | 354e94ea4ae79821455410fa3a808b6c0b070485 /src/TimestampDecoder.h | |
| parent | 5cfd2ac643e37605761685dbeafc99ec1fffd059 (diff) | |
| parent | e3cc55d32281be5dd7b7017d6dfed42be24d3cda (diff) | |
| download | dabmod-23ad47277e73348bca32226d87274541e56bbebb.tar.gz dabmod-23ad47277e73348bca32226d87274541e56bbebb.tar.bz2 dabmod-23ad47277e73348bca32226d87274541e56bbebb.zip | |
Merge branch 'next' into tii
Diffstat (limited to 'src/TimestampDecoder.h')
| -rw-r--r-- | src/TimestampDecoder.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/TimestampDecoder.h b/src/TimestampDecoder.h index 8c6b362..82753d1 100644 --- a/src/TimestampDecoder.h +++ b/src/TimestampDecoder.h @@ -113,9 +113,8 @@ class TimestampDecoder { public: TimestampDecoder( - struct modulator_offset_config& config, - Logger& logger): - myLogger(logger), modconfig(config) + struct modulator_offset_config& config) : + modconfig(config) { inhibit_second_update = 0; time_pps = 0.0; @@ -126,8 +125,8 @@ class TimestampDecoder gmtime_r(0, &temp_time); offset_changed = false; - myLogger.level(info) << "Setting up timestamp decoder with " << - (modconfig.use_offset_fixed ? "fixed" : + etiLog.level(info) << "Setting up timestamp decoder with " << + (modconfig.use_offset_fixed ? "fixed" : (modconfig.use_offset_file ? "dynamic" : "none")) << " offset"; @@ -148,9 +147,6 @@ class TimestampDecoder bool updateModulatorOffset(); protected: - /* Main program logger */ - Logger& myLogger; - /* Push a new MNSC field into the decoder */ void pushMNSCData(int framephase, uint16_t mnsc); |