diff --git a/sflphone-common/src/audio/codecs/codecDescriptor.cpp b/sflphone-common/src/audio/codecs/codecDescriptor.cpp index 29355764f1f8a5e96a13fc8ee2b6c8a1d6dbba62..a4a329dd9785048189826889e4de4ba0d9c77a93 100644 --- a/sflphone-common/src/audio/codecs/codecDescriptor.cpp +++ b/sflphone-common/src/audio/codecs/codecDescriptor.cpp @@ -51,7 +51,7 @@ CodecDescriptor::init() _nbCodecs = CodecDynamicList.size(); if (_nbCodecs <= 0) { - _debug (" Error - No codecs available in directory %s" , CODECS_DIR); + _error ("CodecDescriptro: Error - No codecs available in directory %s" , CODECS_DIR); } int i; @@ -97,7 +97,7 @@ CodecDescriptor::getCodec (AudioCodecType payload) return (iter->second); } - _debug ("Error cannont found codec %i in _CodecsMap from codec descriptor", payload); + _error ("CodecDescriptor: Error cannont found codec %i in _CodecsMap from codec descriptor", payload); return NULL; } @@ -167,7 +167,7 @@ std::vector<AudioCodec*> CodecDescriptor::scanCodecDirectory (void) { for (i = 0 ; (unsigned int) i < dirToScan.size() ; i++) { std::string dirStr = dirToScan[i]; - _debug ("Scanning %s to find audio codecs....", dirStr.c_str()); + _debug ("CodecDescriptor: Scanning %s to find audio codecs....", dirStr.c_str()); DIR *dir = opendir (dirStr.c_str()); AudioCodec* audioCodec; @@ -349,7 +349,7 @@ bool CodecDescriptor::isCodecLoaded (int payload) { std::vector <std::string> CodecDescriptor::getCodecSpecifications (const int32_t& payload) { - _warn ("Gathering codec specifications for payload %i", payload); + _debug ("CodecDescriptor: Gathering codec specifications for payload %i", payload); std::vector<std::string> v; std::stringstream ss; diff --git a/sflphone-common/src/dbus/configurationmanager.cpp b/sflphone-common/src/dbus/configurationmanager.cpp index b243157e772af3b07b793a7a13138b17dc846f51..a9a36eb8995bb69bdef2238cd19cf6b919aa20bf 100644 --- a/sflphone-common/src/dbus/configurationmanager.cpp +++ b/sflphone-common/src/dbus/configurationmanager.cpp @@ -493,7 +493,7 @@ std::vector<std::string> ConfigurationManager::getActiveCodecList( void ConfigurationManager::setActiveCodecList( const std::vector<std::string>& list, const std::string& accountID) { - _debug ("ConfigurationManager::setActiveCodecList received"); + _debug ("ConfigurationManager: Active codec list received"); Account *acc; @@ -504,9 +504,12 @@ void ConfigurationManager::setActiveCodecList( } } + // Audio devices related methods std::vector<std::string> ConfigurationManager::getInputAudioPluginList() { + _debug("ConfigurationManager: Active codec list received"); + std::vector<std::string> v; v.push_back("default"); @@ -516,6 +519,8 @@ std::vector<std::string> ConfigurationManager::getInputAudioPluginList() { return v; } + + std::vector<std::string> ConfigurationManager::getOutputAudioPluginList() { std::vector<std::string> v; @@ -526,6 +531,7 @@ std::vector<std::string> ConfigurationManager::getOutputAudioPluginList() { return v; } + void ConfigurationManager::setInputAudioPlugin(const std::string& audioPlugin) { return Manager::instance().setInputAudioPlugin(audioPlugin); } diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp index f0ba7bd4516d46e9cebcb028b27178fb9db4df81..bfd0c85739eeaadaeef9697028d2967e02db8c79 100644 --- a/sflphone-common/src/managerimpl.cpp +++ b/sflphone-common/src/managerimpl.cpp @@ -2342,7 +2342,7 @@ void ManagerImpl::setOutputAudioPlugin (const std::string& audioPlugin) { int res; - _debug ("Set output audio plugin"); + _debug ("Manager: Set output audio plugin"); _audiodriver -> setErrorMessage(-1); res = _audiodriver -> openDevice(_audiodriver -> getIndexIn(), _audiodriver -> getIndexOut(), _audiodriver -> getSampleRate(), @@ -2360,7 +2360,7 @@ void ManagerImpl::setOutputAudioPlugin (const std::string& audioPlugin) { * Get list of supported audio output device */ std::vector<std::string> ManagerImpl::getAudioOutputDeviceList (void) { - _debug ("Get audio output device list"); + _debug ("Manager: Get audio output device list"); AlsaLayer *layer; std::vector<std::string> devices;