Commit 8c924db9 authored by Alexandre Bourget's avatar Alexandre Bourget
Browse files

Fix HORRIBLE bug introduced by last commit. (private/public).

Document managerimplg.cpp.
parent 7ff9c3ac
......@@ -1040,6 +1040,9 @@ ManagerImpl::initConfigFile (void)
std::string section;
section = SIGNALISATION;
// Default values, that will be overwritten by the call to
// 'populateFromFile' below.
fill_config_int(SYMMETRIC, YES_STR);
fill_config_int(PLAY_DTMF, YES_STR);
fill_config_int(PLAY_TONES, YES_STR);
......@@ -1067,6 +1070,7 @@ ManagerImpl::initConfigFile (void)
fill_config_str(VOICEMAIL_NUM, DFT_VOICEMAIL);
fill_config_int(CONFIG_ZEROCONF, CONFIG_ZEROCONF_DEFAULT_STR);
// Loads config from ~/.sflphone/sflphonedrc or so..
if (createSettingsPath() == 1) {
_exist = _config.populateFromFile(_path);
}
......@@ -1094,6 +1098,11 @@ void
ManagerImpl::setCodecsOrder(const std::vector< ::DBus::String >& codecs)
{
// TODO: set codecs using the list.
/* S'assurer ici de sauvegarderl es codecs aussi dans la configuration
* (appeler saveConfig ?), et de sauver pour les Codecs, le _codecName
* de chaque codec, et non pas la _description. Faut s'assurer de ça
* auprès de D-Bus aussi.*/
_debug("Set codecs preferred order: UNIMPLEMENTED YET :)\n");
}
......
......@@ -254,15 +254,24 @@ public:
* purge from configuration.
*/
void removeAccount(const AccountID& accountID);
/*
* get the default account
*/
std::string getDefaultAccount();
/*
* get the default account
*/
std::string getDefaultAccount();
/*
* Set an account as default
*/
/**
* Set the prefered order for codecs.
* Called by D-Bus command: "setCodecPreferedOrder"
*
* @param codecs A list of strings ("codecName"s) of the codecs.
*/
void setCodecsOrder(const std::vector< ::DBus::String >& codecs);
/*
* Set an account as default
*/
void setDefaultAccount(const AccountID& accountID);
......@@ -400,15 +409,6 @@ private:
*/
void initAudioCodec(void);
/**
* Set the prefered order for codecs.
* Called by D-Bus command: "setCodecPreferedOrder"
*
* @param codecs A list of strings ("codecName"s) of the codecs.
*/
void setCodecsOrder(const std::vector< ::DBus::String >& codecs);
/*
* Initialize audiodriver
*/
......
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