aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Pöschel <github@basicmaster.de>2016-05-05 14:58:28 +0200
committerStefan Pöschel <github@basicmaster.de>2016-05-05 14:58:28 +0200
commit9183cd317bebe96b54a227da13d8e7c70b4ae67f (patch)
tree2f9688fd580d46fde2e07151bd5d7347665cc2ed
parent55d65a22abd83ea841cc2b22d10790897e145c9a (diff)
downloadfdk-aac-dabplus-9183cd317bebe96b54a227da13d8e7c70b4ae67f.tar.gz
fdk-aac-dabplus-9183cd317bebe96b54a227da13d8e7c70b4ae67f.tar.bz2
fdk-aac-dabplus-9183cd317bebe96b54a227da13d8e7c70b4ae67f.zip
DLS: use common toggle flag for both DL and DL Plus msgs/cmds
-rw-r--r--src/mot-encoder.cpp5
1 files changed, 1 insertions, 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;
}