diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-11-28 20:08:56 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-11-28 20:08:56 +0100 |
| commit | 6800fb66282525542366bc58df3095b93e3bf8ca (patch) | |
| tree | c6e7607b5090ceff1e69a1f0fff206b1a7a9c07b /src/utils.cpp | |
| parent | 96b4dc4efca1b164f79a7f7394449866f034ac31 (diff) | |
| download | dabmux-6800fb66282525542366bc58df3095b93e3bf8ca.tar.gz dabmux-6800fb66282525542366bc58df3095b93e3bf8ca.tar.bz2 dabmux-6800fb66282525542366bc58df3095b93e3bf8ca.zip | |
Remove service linking active from RC
This can be added later if the need arises, and when proper testing
validates the implementation.
Diffstat (limited to 'src/utils.cpp')
| -rw-r--r-- | src/utils.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/utils.cpp b/src/utils.cpp index 4431407..4c08e8b 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -369,18 +369,17 @@ void printSubchannels(vector<DabSubchannel*>& subchannels) static void printLinking(const shared_ptr<dabEnsemble> ensemble) { etiLog.log(info, " Linkage Sets"); - for (const auto& linkageset : ensemble->linkagesets) { - const auto& lsd = linkageset->data; + for (const auto& ls : ensemble->linkagesets) { - etiLog.level(info) << " set " << linkageset->get_rc_name(); - etiLog.log(info, " LSN 0x%04x", lsd.lsn); - etiLog.level(info) << " active " << (lsd.active ? "true" : "false"); - etiLog.level(info) << " " << (lsd.hard ? "hard" : "soft"); - etiLog.level(info) << " international " << (lsd.international ? "true" : "false"); - etiLog.level(info) << " key service " << lsd.keyservice; + etiLog.level(info) << " set " << ls->get_name(); + etiLog.log(info, " LSN 0x%04x", ls->lsn); + etiLog.level(info) << " active " << (ls->active ? "true" : "false"); + etiLog.level(info) << " " << (ls->hard ? "hard" : "soft"); + etiLog.level(info) << " international " << (ls->international ? "true" : "false"); + etiLog.level(info) << " key service " << ls->keyservice; etiLog.level(info) << " ID list"; - for (const auto& link : lsd.id_list) { + for (const auto& link : ls->id_list) { switch (link.type) { case ServiceLinkType::DAB: etiLog.level(info) << " type DAB"; @@ -396,7 +395,7 @@ static void printLinking(const shared_ptr<dabEnsemble> ensemble) break; } etiLog.log(info, " id 0x%04x", link.id); - if (lsd.international) { + if (ls->international) { etiLog.log(info, " ecc 0x%04x", link.ecc); } } |