← Back to branch summary

~ubuntu-branches/ubuntu/saucy/sflphone/saucy

« back to all changes in this revision

Viewing changes to sflphone-common/src/audio/sound/tonelist.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Francois Marier
  • Date: 2010-12-24 16:33:55 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20101224163355-tkvvikqxbrbav6up
Tags: 0.9.11-1
* New upstream release
* Add new build dependencies on libwebkit-dev and libyaml-dev

* Bump Standards-Version up to 3.9.1
* Bump debhelper compatibility to 8
* Patch another typo in the upstream code (lintian notice)

Show diffs side-by-side

added added

removed removed

Lines of Context:
sflphone-common/src/audio/sound/tonelist.cpp
33
33
#include "tonelist.h"
34
34
 
35
35
ToneList::ToneList() : _nbTone (TONE_NBTONE) ,
36
 
        _nbCountry (TONE_NBCOUNTRY),
37
 
        _defaultCountryId (ZID_NORTH_AMERICA)
 
36
    _nbCountry (TONE_NBCOUNTRY),
 
37
    _defaultCountryId (ZID_NORTH_AMERICA)
38
38
{
39
39
    initToneDefinition();
40
40
}
119
119
}
120
120
 
121
121
TelephoneTone::TelephoneTone (const std::string& countryName, unsigned int sampleRate) :
122
 
        _currentTone (Tone::TONE_NULL),
123
 
        _toneList()
 
122
    _currentTone (Tone::TONE_NULL),
 
123
    _toneList()
124
124
{
 
125
    _debug ("TelephoneTone: Generate new telephone tones at %u Hz", sampleRate);
 
126
 
125
127
    ToneList::COUNTRYID countryId = _toneList.getCountryId (countryName);
126
128
    _tone[Tone::TONE_DIALTONE] = new Tone (_toneList.getDefinition (countryId, Tone::TONE_DIALTONE), sampleRate);
127
129
    _tone[Tone::TONE_BUSY] = new Tone (_toneList.getDefinition (countryId, Tone::TONE_BUSY), sampleRate);