From 6c1387e35be0312e5089c10db90462d3d401be60 Mon Sep 17 00:00:00 2001
From: Julian Smith <jules@op59.net>
Date: Sun, 1 Nov 2020 14:44:38 +0000
Subject: [PATCH] src/Instrumentation/commradio.cxx: don't use and/or keywords
because breaks on windows.
---
src/Instrumentation/commradio.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Instrumentation/commradio.cxx b/src/Instrumentation/commradio.cxx
index e882e65c1..43a675d3e 100644
--- a/src/Instrumentation/commradio.cxx
+++ b/src/Instrumentation/commradio.cxx
@@ -693,14 +693,14 @@ void CommRadioImpl::updateAudio()
bool atis_enabled = _atis_enabled_node->getBoolValue();
int atis_delta = 0;
- if (atis_enabled and !_atis_enabled_prev) atis_delta = 1;
- if (!atis_enabled and _atis_enabled_prev) atis_delta = -1;
+ if (atis_enabled && !_atis_enabled_prev) atis_delta = 1;
+ if (!atis_enabled && _atis_enabled_prev) atis_delta = -1;
if (_atisSpeaker.hasSpokenAtis()) {
// the speaker has created a new atis sample
// remove previous atis sample
_sampleGroup->remove(atisRef);
- if (!atis_delta and atis_enabled) atis_delta = 1;
+ if (!atis_delta && atis_enabled) atis_delta = 1;
}
if (atis_delta == 1) {
// Start play of atis text. We store the most recent sample in _atis_sample