cleanup src/utils/charsets.* to match codestyle

This cleans up the two files src/utils/charsets.cpp and src/utils/charsets.h to
correspond to our clang format, and the code is added to a namespace to be
cleaner on the outside, public is the namespace "charsets" in the cpp then
a pseudo namespace for private functions so that it is not known to the outside world.

Author: AlwinEsch

src/dsp_dab/dab-constants.cpp

@@ -135,22 +135,24 @@ string DabLabel::utf8_label() const
 
 string DabLabel::fig1_label_utf8() const
 {
-    return toUtf8StringUsingCharset(fig1_label.c_str(), charset);
+    return charsets::toUtf8(fig1_label.c_str(), charset);
 }
 
 string DabLabel::fig1_shortlabel_utf8() const
 {
     const string shortlabel = flag_to_shortlabel(fig1_label, fig1_flag);
-    return toUtf8StringUsingCharset(shortlabel.c_str(), charset);
+    return charsets::toUtf8(shortlabel.c_str(), charset);
 }
 
 void DabLabel::setCharset(uint8_t charset_id)
 {
-    charset = static_cast<CharacterSet>(charset_id);
+    charset = static_cast<charsets::CharacterSet>(charset_id);
 }
 
 string DabLabel::fig2_label() const
 {
+    using charsets::CharacterSet;
+
     vector<uint8_t> segments_cat;
     for (size_t i = 0; i < segment_count; i++) {
         if (segments.count(i) == 0) {
@@ -169,8 +171,7 @@ string DabLabel::fig2_label() const
         case CharacterSet::UnicodeUtf8:
             return string(segments_cat.begin(), segments_cat.end());
         case CharacterSet::UnicodeUcs2:
-            return toUtf8StringUsingCharset(
-                    segments_cat.data(), CharacterSet::UnicodeUcs2, segments_cat.size());
+            return charsets::toUtf8(segments_cat.data(), CharacterSet::UnicodeUcs2, segments_cat.size());
         case CharacterSet::Undefined:
             return "";
     }

src/dsp_dab/dab-constants.h

@@ -137,7 +137,7 @@ class DABParams {
 struct DabLabel {
     // Label from FIG 1
     /* FIG 1 labels are usually in EBU Latin encoded */
-    CharacterSet charset = CharacterSet::EbuLatin;
+    charsets::CharacterSet charset = charsets::CharacterSet::EbuLatin;
     std::string fig1_label; // encoded according to charset
     uint16_t    fig1_flag = 0x0000; // describes the short label
 
@@ -153,7 +153,7 @@ struct DabLabel {
 
     std::map<int, std::vector<uint8_t> > segments;
     size_t segment_count = 0; // number if actual segments (not segment count as in spec)
-    CharacterSet extended_label_charset = CharacterSet::Undefined;
+    charsets::CharacterSet extended_label_charset = charsets::CharacterSet::Undefined;
     uint8_t toggle_flag = 0;
     bool fig2_rfu = false; // draftETSI TS 103 176 v2.2.1 gives this a new meaning
 

src/dsp_dab/decoder_adapter.cpp

@@ -142,12 +142,14 @@ void DecoderAdapter::FECInfo(int total_corr_count, bool uncorr_errors)
 
 void DecoderAdapter::PADChangeDynamicLabel(const DL_STATE &dl)
 {
+    using charsets::CharacterSet;
+
     if (dl.raw.empty()) {
         myInterface.onNewDynamicLabel("");
     }
     else {
         myInterface.onNewDynamicLabel(
-                toUtf8StringUsingCharset(
+                charsets::toUtf8(
                     dl.raw.data(),
                     (CharacterSet)dl.charset,
                     dl.raw.size()));

src/dsp_dab/fib-processor.cpp

@@ -917,6 +917,8 @@ static void handle_ext_label_data_field(const uint8_t *f, uint8_t len_bytes,
         uint8_t toggle_flag, uint8_t segment_index, uint8_t rfu,
         DabLabel& label)
 {
+    using charsets::CharacterSet;
+
     if (label.toggle_flag != toggle_flag) {
         label.segments.clear();
         label.extended_label_charset = CharacterSet::Undefined;

src/dsp_dab/mot_manager.cpp

@@ -156,7 +156,7 @@ bool MOTObject::ParseCheckHeader(MOT_FILE& target_file) {
 			if(data_len == 0)
 				return false;
 			//file.content_name = CharsetTools::ConvertTextToUTF8(&data[offset + 1], data_len - 1, data[offset] >> 4, true, &file.content_name_charset);
-            file.content_name = toUtf8StringUsingCharset ( (const char *)&data[offset + 1], (CharacterSet) (data[offset] >> 4), data_len - 1);
+            file.content_name = charsets::toUtf8( (const char *)&data[offset + 1], (charsets::CharacterSet) (data[offset] >> 4), data_len - 1);
 			new_content_name = file.content_name;
 //			fprintf(stderr, "ContentName: '%s'\n", file.content_name.c_str());
 			break;