Add partial FIG2 label support

Add support for Ensemble label, programme services and components,
although the implementation for the component label is not properly
tested. (data services still to be done)

Neither short labels nor UCS-2 are not yet implemented.

Also, support for draftETSI TS 103 176 which redefines the meaning of
Rfa is still pending.

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/charset/charset.cpp b/lib/charset/charset.cpp
index 1abc097..f5eb216 100644
--- a/lib/charset/charset.cpp
+++ b/lib/charset/charset.cpp
@@ -73,7 +73,7 @@ CharsetConverter::CharsetConverter()
     }
 }
 
-std::string CharsetConverter::convert(std::string line_utf8, bool up_to_first_error)
+std::string CharsetConverter::utf8_to_ebu(std::string line_utf8, bool up_to_first_error)
 {
     string::iterator end_it;
 
@@ -107,7 +107,7 @@ std::string CharsetConverter::convert(std::string line_utf8, bool up_to_first_er
     return encoded_line;
 }
 
-std::string CharsetConverter::convert_ebu_to_utf8(const std::string& str)
+std::string CharsetConverter::ebu_to_utf8(const std::string& str)
 {
     string utf8_str;
     for (const uint8_t c : str) {
diff --git a/lib/charset/charset.h b/lib/charset/charset.h
index 8476ee7..5f5899e 100644
--- a/lib/charset/charset.h
+++ b/lib/charset/charset.h
@@ -39,12 +39,12 @@ class CharsetConverter
          *  stream. If up_to_first_error is set, convert as much text as possible.
          *  If false, raise an utf8::exception in case of conversion errors.
          */
-        std::string convert(std::string line_utf8, bool up_to_first_error = true);
+        std::string utf8_to_ebu(std::string line_utf8, bool up_to_first_error = true);
 
         /*! Convert a EBU Latin byte stream to a UTF-8 encoded string.
          *  Invalid input characters are converted to ⁇ (unicode U+2047).
          */
-        std::string convert_ebu_to_utf8(const std::string& str);
+        std::string ebu_to_utf8(const std::string& str);
 
     private:
         // Representation of the table in 32-bit unicode