jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

manager: Rename the 'ringchoice' local variable to 'ringtone'.

Browse Source 
* src/manager.cpp (Manager::playRingtone)<ringchoice>: Rename local
variable to...
<ringtone> ... this.

Change-Id: Ia94ead6dfa070a5c18d3e267e00d8895f38e5b09
This commit is contained in:
Maxim Cournoyer
2022-01-19 12:12:15 -05:00
committed by Amin Bandali
parent e23a88672d
commit 3377a4581e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/manager.cpp
View File

@ -2090,13 +2090,13 @@ Manager::playRingtone(const std::string& accountID)
return; return;
} }
std::string ringchoice = account->getRingtonePath(); std::string ringtone = account->getRingtonePath();
if (ringchoice.find(DIR_SEPARATOR_CH) == std::string::npos) { if (ringtone.find(DIR_SEPARATOR_CH) == std::string::npos) {
// A base file name was provided (such as the default); try to // A base file name was provided (such as the default); try to
// resolve it from Jami's data installation prefix. // resolve it from Jami's data installation prefix.
static const char* const RINGDIR = "ringtones"; static const char* const RINGDIR = "ringtones";
ringchoice = std::string(JAMI_DATADIR) + DIR_SEPARATOR_STR + RINGDIR + DIR_SEPARATOR_STR ringtone = std::string(JAMI_DATADIR) + DIR_SEPARATOR_STR + RINGDIR + DIR_SEPARATOR_STR
+ ringchoice; + ringtone;
} }
{ {
@ -2112,7 +2112,7 @@ Manager::playRingtone(const std::string& accountID)
pimpl_->toneCtrl_.setSampleRate(pimpl_->audiodriver_->getSampleRate()); pimpl_->toneCtrl_.setSampleRate(pimpl_->audiodriver_->getSampleRate());
} }
if (not pimpl_->toneCtrl_.setAudioFile(ringchoice)) if (not pimpl_->toneCtrl_.setAudioFile(ringtone))
ringback(); ringback();
} }