Commit 653a8a3b authored by Rafaël Carré's avatar Rafaël Carré
Browse files

remove some debug, enhance some other

parent a892f0f8
......@@ -88,7 +88,6 @@ void AudioRtpRecordHandler::setRtpMedia (AudioCodec* audioCodec)
void AudioRtpRecordHandler::initBuffers()
{
// Set sampling rate, main buffer choose the highest one
// Manager::instance().getMainBuffer()->setInternalSamplingRate (codecSampleRate);
Manager::instance().audioSamplingRateChanged(_audioRtpRecord._codecSampleRate);
// initialize SampleRate converter using AudioLayer's sampling rate
......
......@@ -185,7 +185,7 @@ void context_changed_callback (pa_context* c, pa_subscription_event_type_t t, ui
_debug ("Audio: PA_SUBSCRIPTION_EVENT_TYPE_MASK");
break;
default:
_debug ("Audio: Unknown event type");
_debug ("Audio: Unknown event type %d", t);
}
}
......
......@@ -2447,7 +2447,6 @@ void ManagerImpl::audioSamplingRateChanged (int samplerate)
return;
}
// Only modify internal sampling rate if new sampling rate is higher
int currentSamplerate = _mainBuffer.getInternalSamplingRate();
if (currentSamplerate >= samplerate) {
......@@ -2456,15 +2455,11 @@ void ManagerImpl::audioSamplingRateChanged (int samplerate)
return;
}
else
_debug ("Manager: Audio sampling rate changed");
_debug ("Manager: Audio sampling rate changed: %d -> %d", currentSamplerate, samplerate);
int type = _audiodriver->getLayerType();
_debug ("Manager: New samplerate: %d", samplerate);
bool wasActive = _audiodriver->isStarted();
_mainBuffer.setInternalSamplingRate(samplerate);
delete _audiodriver;
......@@ -2476,15 +2471,11 @@ void ManagerImpl::audioSamplingRateChanged (int samplerate)
unsigned int sampleRate = _audiodriver->getSampleRate();
delete _telephoneTone;
_debug ("Manager: Load telephone tone");
std::string country = preferences.getZoneToneChoice();
_telephoneTone = new TelephoneTone (country, sampleRate);
_telephoneTone = new TelephoneTone(preferences.getZoneToneChoice(), sampleRate);
delete _dtmfKey;
_debug ("Manager: Loading DTMF key with sample rate %d", sampleRate);
_dtmfKey = new DTMF (sampleRate);
// Restart audio layer if it was active
if (wasActive)
_audiodriver->startStream();
......@@ -3186,7 +3177,6 @@ std::map<std::string, std::string> ManagerImpl::getConferenceDetails (
std::vector<std::string> ManagerImpl::getConferenceList (void) const
{
_debug ("ManagerImpl::getConferenceList");
std::vector<std::string> v;
vectorFromMapKeys(_conferencemap, v);
......
......@@ -83,9 +83,6 @@ typedef std::map<std::string, std::string> CallAccountMap;
typedef std::map<std::string, Call::CallConfiguration> CallConfigMap;
/** Define a type for std::string vector (waiting list, incoming not answered) */
typedef std::set<std::string> CallIDSet;
/** To send multiple string */
typedef std::list<std::string> TokenList;
......
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