From 2ec5ea48a3cfa5501cb3641f6bf382bf18b45f86 Mon Sep 17 00:00:00 2001 From: Martina Date: Wed, 12 Jul 2017 18:04:47 +0200 Subject: [PATCH] tunes: for custom tunes set silence from tune control message and set silence to 0 when the end of the string is reached --- src/lib/tunes/tunes.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/tunes/tunes.cpp b/src/lib/tunes/tunes.cpp index 8b9db2b178..d418a2f5a9 100644 --- a/src/lib/tunes/tunes.cpp +++ b/src/lib/tunes/tunes.cpp @@ -94,6 +94,7 @@ int Tunes::set_control(const tune_control_s &tune_control) case tune_control_s::TUNE_ID_CUSTOM: _frequency = (unsigned)tune_control.frequency; _duration = (unsigned)tune_control.duration; + _silence = (unsigned)tune_control.silence; _using_custom_msg = true; break; @@ -151,7 +152,7 @@ int Tunes::get_next_tune(unsigned &frequency, unsigned &duration, unsigned &sile _using_custom_msg = false; frequency = _frequency; duration = _duration; - silence = 0; + silence = _silence; return TUNE_STOP; } @@ -169,6 +170,7 @@ int Tunes::get_next_tune(unsigned &frequency, unsigned &duration, unsigned &sile int c = next_char(); if (c == 0) { + silence = 0; goto tune_end; }