From 9183cd317bebe96b54a227da13d8e7c70b4ae67f Mon Sep 17 00:00:00 2001 From: Stefan Pöschel Date: Thu, 5 May 2016 14:58:28 +0200 Subject: DLS: use common toggle flag for both DL and DL Plus msgs/cmds --- src/mot-encoder.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mot-encoder.cpp b/src/mot-encoder.cpp index 28e6ce8..03bdfa6 100644 --- a/src/mot-encoder.cpp +++ b/src/mot-encoder.cpp @@ -466,7 +466,6 @@ struct DL_STATE { typedef uint8_vector_t pad_t; static bool dls_toggle = false; -static bool dl_plus_toggle = false; static DL_STATE dl_state_prev; @@ -1453,7 +1452,7 @@ DATA_GROUP* createDynamicLabelPlus(const DL_STATE& dl_state) { // prefix: toggle? + first seg + last seg + command flag + command seg_data[0] = - (dl_plus_toggle ? (1 << 7) : 0) + + (dls_toggle ? (1 << 7) : 0) + (1 << 6) + (1 << 5) + (1 << 4) + @@ -1667,8 +1666,6 @@ void writeDLS(int output_fd, const std::string& dls_file, uint8_t charset, bool remove_label_dg = createDynamicLabelCommand(DLS_CMD_REMOVE_LABEL); dls_toggle = !dls_toggle; // indicate changed text - if (dl_state.dl_plus_enabled) - dl_plus_toggle = !dl_plus_toggle; dl_state_prev = dl_state; } -- cgit v1.2.3