diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-29 22:09:31 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-29 22:09:31 +0200 |
| commit | 5132756f09c7a0dafe4644db92718ee3d1a58d6c (patch) | |
| tree | 094343cedcd9fe8bacb3380e98d96e952b7115ea /src/DabMultiplexer.cpp | |
| parent | 5c3c6d734ff0c57fd3d45746df23b96e0e7fc99e (diff) | |
| parent | e7ad2e1fab9c51189fdc8b4f2d81f625da9dd422 (diff) | |
| download | dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.tar.gz dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.tar.bz2 dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.zip | |
Merge branch 'next' into servicelinking
Diffstat (limited to 'src/DabMultiplexer.cpp')
| -rw-r--r-- | src/DabMultiplexer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp index 90d3d02..4a3234e 100644 --- a/src/DabMultiplexer.cpp +++ b/src/DabMultiplexer.cpp @@ -162,7 +162,7 @@ void DabMultiplexer::prepare() * Ideally, we must be able to restart transmission s.t. the receiver * synchronisation is preserved. */ - gettimeofday(&mnsc_time, NULL); + gettimeofday(&mnsc_time, nullptr); #if HAVE_OUTPUT_EDI edi_time = chrono::system_clock::now(); @@ -212,7 +212,7 @@ void DabMultiplexer::prepare_subchannels() void DabMultiplexer::prepare_services_components() { set<uint32_t> ids; - dabProtection* protection = NULL; + dabProtection* protection = nullptr; vector<DabComponent*>::iterator component; vector<DabSubchannel*>::iterator subchannel; @@ -301,7 +301,7 @@ void DabMultiplexer::prepare_services_components() void DabMultiplexer::prepare_data_inputs() { - dabProtection* protection = NULL; + dabProtection* protection = nullptr; vector<DabSubchannel*>::iterator subchannel; // Prepare and check the data inputs @@ -773,7 +773,7 @@ void DabMultiplexer::mux_frame(std::vector<std::shared_ptr<DabOutput> >& outputs currentFrame++; } -void DabMultiplexer::print_info(void) +void DabMultiplexer::print_info() { // Print settings before starting etiLog.log(info, "--- Multiplex configuration ---"); |