Commit ad35129a authored by llea's avatar llea
Browse files

Spellcheck

parent 7bd9a86b
......@@ -56,7 +56,7 @@ void
ToneThread::run (void) {
int k;
int spkrVolume;
while (mngr->getTonezone()) {
while (mngr->getZonetone()) {
spkrVolume = mngr->getSpkrVolume();
// control volume + mono->stereo
for (int j = 0; j < size; j++) {
......@@ -260,7 +260,7 @@ ToneGenerator::toneHandle (int idr) {
tonethread->start();
}
if (!manager->getTonezone()) {
if (!manager->getZonetone()) {
manager->getAudioDriver()->stopStream();
manager->getAudioDriver()->mainSndRingBuffer()->flush();
if (tonethread != NULL) {
......@@ -308,7 +308,7 @@ ToneGenerator::playRingtone (const char *fileName) {
tonethread = new ToneThread (manager, (int16*)dst, expandedsize);
tonethread->start();
}
if (!manager->getTonezone()) {
if (!manager->getZonetone()) {
manager->getAudioDriver()->stopStream();
manager->getAudioDriver()->mainSndRingBuffer()->flush();
if (tonethread != NULL) {
......
This diff is collapsed.
......@@ -626,7 +626,7 @@ QtGUIMainWindow::dialtone (bool var) {
if (_dialtone != var) {
_dialtone = var;
}
_callmanager->setTonezone(var);
_callmanager->setZonetone(var);
_callmanager->getTonegenerator()->toneHandle(ZT_TONE_DIALTONE);
} else {
_callmanager->error()->errorName(OPEN_FAILED_DEVICE);
......
......@@ -75,7 +75,7 @@ Manager::Manager (void)
_startTime = 0;
_endTime = 0;
_path = "";
_tonezone = false;
_zonetone = false;
_congestion = false;
_ringtone = false;
_ringback = false;
......@@ -580,7 +580,7 @@ Manager::congestion (bool var) {
if (_congestion != var) {
_congestion = var;
}
_tonezone = var;
_zonetone = var;
_tone->toneHandle(ZT_TONE_CONGESTION);
} else {
_error->errorName(OPEN_FAILED_DEVICE);
......@@ -593,7 +593,7 @@ Manager::ringback (bool var) {
if (_ringback != var) {
_ringback = var;
}
_tonezone = var;
_zonetone = var;
_tone->toneHandle(ZT_TONE_RINGTONE);
} else {
_error->errorName(OPEN_FAILED_DEVICE);
......@@ -604,9 +604,9 @@ void
Manager::ringtone (bool var)
{
if (isDriverLoaded()) {
if (getNumberOfCalls() > 1 and _tonezone and var == false) {
if (getNumberOfCalls() > 1 and _zonetone and var == false) {
// If more than one line is ringing
_tonezone = false;
_zonetone = false;
_tone->playRingtone((_gui->getRingtoneFile()).data());
}
......@@ -614,7 +614,7 @@ Manager::ringtone (bool var)
_ringtone = var;
}
_tonezone = var;
_zonetone = var;
if (getNumberOfCalls() == 1) {
// If just one line is ringing
_tone->playRingtone((_gui->getRingtoneFile()).data());
......
......@@ -105,8 +105,8 @@ public:
CodecDescriptorVector* getCodecDescVector(void);
inline bool getTonezone (void) { return _tonezone; }
inline void setTonezone (bool b) { _tonezone = b; }
inline bool getZonetone (void) { return _zonetone; }
inline void setZonetone (bool b) { _zonetone = b; }
/*
* Attribute a new random id for a new call
......@@ -271,7 +271,7 @@ private:
int _exist;
unsigned int _nCodecs;
bool _tonezone;
bool _zonetone;
bool _congestion;
bool _ringback;
bool _ringtone;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment