summaryrefslogtreecommitdiffstats
path: root/src/utils.cpp
diff options
context:
space:
mode:
authorStefan Pöschel <github@basicmaster.de>2015-05-24 23:42:35 +0200
committerStefan Pöschel <github@basicmaster.de>2015-05-24 23:42:35 +0200
commitf470de09c4215c39387fbe6d85330c90fecea10d (patch)
tree31dbb58ab8864cbb3029e92e0ae029565f2cbee2 /src/utils.cpp
parent2391d2a38ff9d85f802f2453ffe20fb58915c097 (diff)
downloaddabmux-f470de09c4215c39387fbe6d85330c90fecea10d.tar.gz
dabmux-f470de09c4215c39387fbe6d85330c90fecea10d.tar.bz2
dabmux-f470de09c4215c39387fbe6d85330c90fecea10d.zip
Labels: use spaces instead of NULs for trailing padding
The NULs ATM used for trailing label padding are not defined in the EBU Latin based charset we use. As all 16 label bytes must be used, use spaces instead, like real-world broadcasters do.
Diffstat (limited to 'src/utils.cpp')
-rw-r--r--src/utils.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/utils.cpp b/src/utils.cpp
index 7c3c516..2c9c317 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -380,7 +380,8 @@ void printServices(vector<DabService*>& services)
for (current = services.begin(); current != services.end(); ++current) {
etiLog.level(info) << "Service " << (*current)->get_rc_name();
- etiLog.level(info) << " label: " << (*current)->label.text();
+ etiLog.level(info) << " label: " <<
+ (*current)->label.long_label();
etiLog.level(info) << " short label: " <<
(*current)->label.short_label();
@@ -413,7 +414,8 @@ void printComponent(DabComponent* component)
{
etiLog.log(info, " service id: %i", component->serviceId);
etiLog.log(info, " subchannel id: %i", component->subchId);
- etiLog.log(info, " label: %s", component->label.text());
+ etiLog.level(info) << " label: " <<
+ component->label.long_label();
etiLog.level(info) << " short label: " <<
component->label.short_label();
@@ -531,7 +533,8 @@ void printEnsemble(dabEnsemble* ensemble)
etiLog.log(info, "Ensemble");
etiLog.log(info, " id: 0x%lx (%lu)", ensemble->id, ensemble->id);
etiLog.log(info, " ecc: 0x%x (%u)", ensemble->ecc, ensemble->ecc);
- etiLog.log(info, " label: %s", ensemble->label.text());
+ etiLog.level(info) << " label: " <<
+ ensemble->label.long_label();
etiLog.level(info) << " short label: " <<
ensemble->label.short_label();