From 3377a4581e1a005a5aba9ccadd9a041493ccaafa Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 19 Jan 2022 12:12:15 -0500 Subject: [PATCH] manager: Rename the 'ringchoice' local variable to 'ringtone'. * src/manager.cpp (Manager::playRingtone): Rename local variable to... ... this. Change-Id: Ia94ead6dfa070a5c18d3e267e00d8895f38e5b09 --- src/manager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/manager.cpp b/src/manager.cpp index e56426cfb..8787b5748 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -2090,13 +2090,13 @@ Manager::playRingtone(const std::string& accountID) return; } - std::string ringchoice = account->getRingtonePath(); - if (ringchoice.find(DIR_SEPARATOR_CH) == std::string::npos) { + std::string ringtone = account->getRingtonePath(); + if (ringtone.find(DIR_SEPARATOR_CH) == std::string::npos) { // A base file name was provided (such as the default); try to // resolve it from Jami's data installation prefix. static const char* const RINGDIR = "ringtones"; - ringchoice = std::string(JAMI_DATADIR) + DIR_SEPARATOR_STR + RINGDIR + DIR_SEPARATOR_STR - + ringchoice; + ringtone = std::string(JAMI_DATADIR) + DIR_SEPARATOR_STR + RINGDIR + DIR_SEPARATOR_STR + + ringtone; } { @@ -2112,7 +2112,7 @@ Manager::playRingtone(const std::string& accountID) pimpl_->toneCtrl_.setSampleRate(pimpl_->audiodriver_->getSampleRate()); } - if (not pimpl_->toneCtrl_.setAudioFile(ringchoice)) + if (not pimpl_->toneCtrl_.setAudioFile(ringtone)) ringback(); }