diff options
| author | Stefan Pöschel <github@basicmaster.de> | 2017-08-24 10:15:31 +0200 |
|---|---|---|
| committer | Stefan Pöschel <github@basicmaster.de> | 2017-08-24 10:15:31 +0200 |
| commit | 65b6c374e716878c46f7ff8ee86f25a5807c29cd (patch) | |
| tree | 1e6908d7bf1532c667783c4c6aa83c3ea3b9289c /src/dls.cpp | |
| parent | 6a835162ecafe48609aa866a800289670a0c9f3c (diff) | |
| download | ODR-PadEnc-65b6c374e716878c46f7ff8ee86f25a5807c29cd.tar.gz ODR-PadEnc-65b6c374e716878c46f7ff8ee86f25a5807c29cd.tar.bz2 ODR-PadEnc-65b6c374e716878c46f7ff8ee86f25a5807c29cd.zip | |
Make data group apptypes constants
Diffstat (limited to 'src/dls.cpp')
| -rw-r--r-- | src/dls.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/dls.cpp b/src/dls.cpp index 92c8da4..e5f6f27 100644 --- a/src/dls.cpp +++ b/src/dls.cpp @@ -36,10 +36,13 @@ const size_t DLSEncoder::DLS_SEG_LEN_PREFIX = 2; const size_t DLSEncoder::DLS_SEG_LEN_CHAR_MAX = 16; const std::string DLSEncoder::DL_PARAMS_OPEN = "##### parameters { #####"; const std::string DLSEncoder::DL_PARAMS_CLOSE = "##### parameters } #####"; +const int DLSEncoder::APPTYPE_START = 2; +const int DLSEncoder::APPTYPE_CONT = 3; + DATA_GROUP* DLSEncoder::createDynamicLabelCommand(uint8_t command) { - DATA_GROUP* dg = new DATA_GROUP(2, 2, 3); + DATA_GROUP* dg = new DATA_GROUP(2, APPTYPE_START, APPTYPE_CONT); uint8_vector_t &seg_data = dg->data; // prefix: toggle? + first seg + last seg + command flag + command @@ -62,7 +65,7 @@ DATA_GROUP* DLSEncoder::createDynamicLabelCommand(uint8_t command) { DATA_GROUP* DLSEncoder::createDynamicLabelPlus(const DL_STATE& dl_state) { size_t tags_size = dl_state.dl_plus_tags.size(); size_t len_dl_plus_cmd_field = 1 + 3 * tags_size; - DATA_GROUP* dg = new DATA_GROUP(2 + len_dl_plus_cmd_field, 2, 3); + DATA_GROUP* dg = new DATA_GROUP(2 + len_dl_plus_cmd_field, APPTYPE_START, APPTYPE_CONT); uint8_vector_t &seg_data = dg->data; // prefix: toggle? + first seg + last seg + command flag + command @@ -292,7 +295,7 @@ DATA_GROUP* DLSEncoder::dls_get(const std::string& text, DABCharset charset, int const char *seg_text_start = text.c_str() + seg_text_offset; size_t seg_text_len = std::min(text.size() - seg_text_offset, DLS_SEG_LEN_CHAR_MAX); - DATA_GROUP* dg = new DATA_GROUP(DLS_SEG_LEN_PREFIX + seg_text_len, 2, 3); + DATA_GROUP* dg = new DATA_GROUP(DLS_SEG_LEN_PREFIX + seg_text_len, APPTYPE_START, APPTYPE_CONT); uint8_vector_t &seg_data = dg->data; // prefix: toggle? + first seg? + last seg? + (seg len - 1) |