aboutsummaryrefslogtreecommitdiffstats
path: root/src/ConfigParser.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2020-04-27 11:33:51 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2020-04-27 11:33:51 +0200
commit5283909d2b9c7068a643571b7d6145cbed33a661 (patch)
treecf85eaeb20df64dc95262531277c2f75f218da6e /src/ConfigParser.cpp
parentcd5ef5af74b7dbee8c27549cd219a4ce5a0999c5 (diff)
downloaddabmux-5283909d2b9c7068a643571b7d6145cbed33a661.tar.gz
dabmux-5283909d2b9c7068a643571b7d6145cbed33a661.tar.bz2
dabmux-5283909d2b9c7068a643571b7d6145cbed33a661.zip
Fix FIG2 config parsing and segment count issue
Thanks to Maik for his patch
Diffstat (limited to 'src/ConfigParser.cpp')
-rw-r--r--src/ConfigParser.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp
index 30140bf..5d73b55 100644
--- a/src/ConfigParser.cpp
+++ b/src/ConfigParser.cpp
@@ -95,16 +95,9 @@ static void parse_fig2_label(ptree& pt, DabLabel& label) {
if (pt_tc) {
FIG2TextControl tc;
tc.bidi_flag = pt_tc->get<bool>("bidi", tc.bidi_flag);
- auto base_direction = pt_tc->get<string>("bidi", "LTR");
+ auto base_direction = pt_tc->get<string>("base_direction", "LTR");
- if (not(base_direction == "LTR" or base_direction == "RTL")) {
- tc.base_direction_is_rtl = (base_direction == "RTL");
- }
- else {
- etiLog.level(error) << "Invalid value " << base_direction <<
- " for fig2 text control base direction";
- throw runtime_error("Invalid FIG2 text control definition");
- }
+ tc.base_direction_is_rtl = (base_direction == "RTL");
tc.contextual_flag = pt_tc->get<bool>("contextual", tc.contextual_flag);
tc.combining_flag = pt_tc->get<bool>("combining", tc.combining_flag);