From 492a949ec719529aa935df665362d76d79674a1f Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Tue, 30 Sep 2008 16:45:56 -0400
Subject: [PATCH] fix warnings in src/audio/tonelist
---
src/audio/tonelist.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/audio/tonelist.cpp b/src/audio/tonelist.cpp
index 2ffb068ce9..e3c739e3f5 100644
--- a/src/audio/tonelist.cpp
+++ b/src/audio/tonelist.cpp
@@ -21,11 +21,9 @@
*/
#include "tonelist.h"
-ToneList::ToneList() {
- _nbTone = TONE_NBTONE; // could be dynamic
- _nbCountry = TONE_NBCOUNTRY; // could be dynamic
-
- _defaultCountryId = ZID_NORTH_AMERICA;
+ToneList::ToneList() : _nbTone( TONE_NBTONE ) ,
+ _nbCountry( TONE_NBCOUNTRY ),
+ _defaultCountryId( ZID_NORTH_AMERICA ){
initToneDefinition();
}
@@ -104,14 +102,16 @@ ToneList::getCountryId(const std::string& countryName)
}
}
-TelephoneTone::TelephoneTone(const std::string& countryName, unsigned int sampleRate) {
+TelephoneTone::TelephoneTone(const std::string& countryName, unsigned int sampleRate) :
+ _currentTone( Tone::TONE_NULL ),
+ _toneList()
+{
ToneList::COUNTRYID countryId = _toneList.getCountryId(countryName);
_tone[Tone::TONE_DIALTONE] = new Tone(_toneList.getDefinition(countryId, Tone::TONE_DIALTONE), sampleRate);
_tone[Tone::TONE_BUSY] = new Tone(_toneList.getDefinition(countryId, Tone::TONE_BUSY), sampleRate);
_tone[Tone::TONE_RINGTONE] = new Tone(_toneList.getDefinition(countryId, Tone::TONE_RINGTONE), sampleRate);
_tone[Tone::TONE_CONGESTION] = new Tone(_toneList.getDefinition(countryId, Tone::TONE_CONGESTION), sampleRate);
- _currentTone = Tone::TONE_NULL;
}
TelephoneTone::~TelephoneTone()
--
GitLab