Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
8c924db9
Commit
8c924db9
authored
17 years ago
by
Alexandre Bourget
Browse files
Options
Downloads
Patches
Plain Diff
Fix HORRIBLE bug introduced by last commit. (private/public).
Document managerimplg.cpp.
parent
7ff9c3ac
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/managerimpl.cpp
+9
-0
9 additions, 0 deletions
src/managerimpl.cpp
src/managerimpl.h
+17
-17
17 additions, 17 deletions
src/managerimpl.h
with
26 additions
and
17 deletions
src/managerimpl.cpp
+
9
−
0
View file @
8c924db9
...
@@ -1040,6 +1040,9 @@ ManagerImpl::initConfigFile (void)
...
@@ -1040,6 +1040,9 @@ ManagerImpl::initConfigFile (void)
std
::
string
section
;
std
::
string
section
;
section
=
SIGNALISATION
;
section
=
SIGNALISATION
;
// Default values, that will be overwritten by the call to
// 'populateFromFile' below.
fill_config_int
(
SYMMETRIC
,
YES_STR
);
fill_config_int
(
SYMMETRIC
,
YES_STR
);
fill_config_int
(
PLAY_DTMF
,
YES_STR
);
fill_config_int
(
PLAY_DTMF
,
YES_STR
);
fill_config_int
(
PLAY_TONES
,
YES_STR
);
fill_config_int
(
PLAY_TONES
,
YES_STR
);
...
@@ -1067,6 +1070,7 @@ ManagerImpl::initConfigFile (void)
...
@@ -1067,6 +1070,7 @@ ManagerImpl::initConfigFile (void)
fill_config_str
(
VOICEMAIL_NUM
,
DFT_VOICEMAIL
);
fill_config_str
(
VOICEMAIL_NUM
,
DFT_VOICEMAIL
);
fill_config_int
(
CONFIG_ZEROCONF
,
CONFIG_ZEROCONF_DEFAULT_STR
);
fill_config_int
(
CONFIG_ZEROCONF
,
CONFIG_ZEROCONF_DEFAULT_STR
);
// Loads config from ~/.sflphone/sflphonedrc or so..
if
(
createSettingsPath
()
==
1
)
{
if
(
createSettingsPath
()
==
1
)
{
_exist
=
_config
.
populateFromFile
(
_path
);
_exist
=
_config
.
populateFromFile
(
_path
);
}
}
...
@@ -1094,6 +1098,11 @@ void
...
@@ -1094,6 +1098,11 @@ void
ManagerImpl
::
setCodecsOrder
(
const
std
::
vector
<
::
DBus
::
String
>&
codecs
)
ManagerImpl
::
setCodecsOrder
(
const
std
::
vector
<
::
DBus
::
String
>&
codecs
)
{
{
// TODO: set codecs using the list.
// 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
"
);
_debug
(
"Set codecs preferred order: UNIMPLEMENTED YET :)
\n
"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/managerimpl.h
+
17
−
17
View file @
8c924db9
...
@@ -260,6 +260,15 @@ public:
...
@@ -260,6 +260,15 @@ public:
*/
*/
std
::
string
getDefaultAccount
();
std
::
string
getDefaultAccount
();
/**
* 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
* Set an account as default
*/
*/
...
@@ -400,15 +409,6 @@ private:
...
@@ -400,15 +409,6 @@ private:
*/
*/
void
initAudioCodec
(
void
);
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
* Initialize audiodriver
*/
*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment