dsp.c: Make minor fixes to debug log messages.

Commit dc8e3eeaaf094a3d16991289934093d5e7127680 improved the debug log
messages in dsp.c. This makes two minor corrections to it:

* Properly guard an added log statement in a conditional.
* Don't add one to the hit count if there was no hit (however, we do
  still want to do this for the case where this is one).

Resolves: #1496

diff --git a/main/dsp.c b/main/dsp.c
index 0bcce132c1c9f55eb09ec9e114b7dff726fddb49..bf518c9a5ff2c688656f8c8b5a7d5b3775df26bc 100644 (file)
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -624,7 +624,7 @@ static int tone_detect(struct ast_dsp *dsp, tone_detect_state_t *s, int16_t *amp
                        ast_debug(9, "%d Hz tone Hit! [%d/%d] Ew=%.4E, Et=%.4E, s/n=%10.2f\n", s->freq, s->hit_count + 1, s->hits_required, tone_energy, s->energy, tone_energy / (s->energy - tone_energy));
                        hit = 1;
                } else {
-                       ast_debug(10, "%d Hz tone [%d/%d] Ew=%.4E, Et=%.4E, s/n=%10.2f\n", s->freq, s->hit_count + 1, s->hits_required, tone_energy, s->energy, tone_energy / (s->energy - tone_energy));
+                       ast_debug(10, "%d Hz tone [%d/%d] Ew=%.4E, Et=%.4E, s/n=%10.2f\n", s->freq, s->hit_count, s->hits_required, tone_energy, s->energy, tone_energy / (s->energy - tone_energy));
                        hit = 0;
                }
 
@@ -635,7 +635,9 @@ static int tone_detect(struct ast_dsp *dsp, tone_detect_state_t *s, int16_t *amp
                if (hit == s->last_hit) {
                        if (!hit) {
                                /* Two successive misses. Tone ended */
-                               ast_debug(9, "Partial detect expired after %d/%d hits\n", s->hit_count, s->hits_required);
+                               if (s->hit_count) {
+                                       ast_debug(9, "Partial detect expired after %d/%d hits\n", s->hit_count, s->hits_required);
+                               }
                                s->hit_count = 0;
                        } else if (!s->hit_count) {
                                s->hit_count++;