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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
df85a6d2
Commit
df85a6d2
authored
Feb 22, 2010
by
Alexandre Savard
Browse files
Options
Downloads
Patches
Plain Diff
[#2926] Code Cleanup
parent
bee2a2d4
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
sflphone-common/src/account.cpp
+5
-6
5 additions, 6 deletions
sflphone-common/src/account.cpp
sflphone-common/src/managerimpl.cpp
+3
-3
3 additions, 3 deletions
sflphone-common/src/managerimpl.cpp
with
8 additions
and
9 deletions
sflphone-common/src/account.cpp
+
5
−
6
View file @
df85a6d2
...
@@ -58,7 +58,7 @@ void Account::loadConfig() {
...
@@ -58,7 +58,7 @@ void Account::loadConfig() {
void
Account
::
setRegistrationState
(
RegistrationState
state
)
{
void
Account
::
setRegistrationState
(
RegistrationState
state
)
{
if
(
state
!=
_registrationState
)
{
if
(
state
!=
_registrationState
)
{
_debug
(
"Account:
:
set
R
egistration
S
tate"
);
_debug
(
"Account:
set
r
egistration
s
tate"
);
_registrationState
=
state
;
_registrationState
=
state
;
// Notify the client
// Notify the client
...
@@ -70,7 +70,7 @@ void Account::loadAudioCodecs (void) {
...
@@ -70,7 +70,7 @@ void Account::loadAudioCodecs (void) {
// if the user never set the codec list, use the default configuration for this account
// if the user never set the codec list, use the default configuration for this account
if
(
Manager
::
instance
().
getConfigString
(
_accountID
,
"ActiveCodecs"
)
==
""
)
{
if
(
Manager
::
instance
().
getConfigString
(
_accountID
,
"ActiveCodecs"
)
==
""
)
{
_
warn
(
"
use the default order"
);
_
info
(
"Account:
use the default order"
);
Manager
::
instance
().
getCodecDescriptorMap
().
setDefaultOrder
();
Manager
::
instance
().
getCodecDescriptorMap
().
setDefaultOrder
();
}
}
...
@@ -92,12 +92,11 @@ void Account::setActiveCodecs (const std::vector <std::string> &list) {
...
@@ -92,12 +92,11 @@ void Account::setActiveCodecs (const std::vector <std::string> &list) {
int
payload
;
int
payload
;
size_t
size
=
list
.
size
();
size_t
size
=
list
.
size
();
_warn
(
"set the custom order %i"
,
list
.
size
());
_info
(
"Account: Set the custom order %i"
,
list
.
size
());
_warn
(
"Setting active codec list"
);
while
(
(
unsigned
int
)
i
<
size
)
{
while
(
(
unsigned
int
)
i
<
size
)
{
payload
=
std
::
atoi
(
list
[
i
].
data
());
payload
=
std
::
atoi
(
list
[
i
].
data
());
_
warn
(
"
Adding codec with RTP payload=%i"
,
payload
);
_
info
(
"Account:
Adding codec with RTP payload=%i"
,
payload
);
//if (Manager::instance ().getCodecDescriptorMap ().isCodecLoaded (payload)) {
//if (Manager::instance ().getCodecDescriptorMap ().isCodecLoaded (payload)) {
_codecOrder
.
push_back
(
(
AudioCodecType
)
payload
);
_codecOrder
.
push_back
(
(
AudioCodecType
)
payload
);
//}
//}
...
@@ -106,7 +105,7 @@ void Account::setActiveCodecs (const std::vector <std::string> &list) {
...
@@ -106,7 +105,7 @@ void Account::setActiveCodecs (const std::vector <std::string> &list) {
// setConfig
// setConfig
std
::
string
s
=
Manager
::
instance
().
serialize
(
list
);
std
::
string
s
=
Manager
::
instance
().
serialize
(
list
);
_
warn
(
"
Setting codec with payload number %s to the active list"
,
s
.
c_str
());
_
info
(
"Account:
Setting codec with payload number %s to the active list"
,
s
.
c_str
());
// Set the config per account
// Set the config per account
Manager
::
instance
().
setConfig
(
_accountID
,
"ActiveCodecs"
,
s
);
Manager
::
instance
().
setConfig
(
_accountID
,
"ActiveCodecs"
,
s
);
...
...
This diff is collapsed.
Click to expand it.
sflphone-common/src/managerimpl.cpp
+
3
−
3
View file @
df85a6d2
...
@@ -2381,7 +2381,7 @@ ManagerImpl::initConfigFile (bool load_user_value, std::string alternate)
...
@@ -2381,7 +2381,7 @@ ManagerImpl::initConfigFile (bool load_user_value, std::string alternate)
void
void
ManagerImpl
::
initAudioCodec
(
void
)
ManagerImpl
::
initAudioCodec
(
void
)
{
{
_
warn
(
"
Init audio codecs"
);
_
info
(
"Manager:
Init audio codecs"
);
/* Init list of all supported codecs by the application.
/* Init list of all supported codecs by the application.
* This is a global list. Every account will inherit it.
* This is a global list. Every account will inherit it.
...
@@ -2396,7 +2396,7 @@ std::vector<std::string> ManagerImpl::retrieveActiveCodecs() {
...
@@ -2396,7 +2396,7 @@ std::vector<std::string> ManagerImpl::retrieveActiveCodecs() {
// This property is now set per account basis
// This property is now set per account basis
std
::
string
s
=
getConfigString
(
AUDIO
,
"ActiveCodecs"
);
std
::
string
s
=
getConfigString
(
AUDIO
,
"ActiveCodecs"
);
_warn
(
"Manager
Impl::r
etrieve
A
ctive
C
odecs: %s"
,
s
.
c_str
());
_info
(
"Manager
: R
etrieve
a
ctive
c
odecs: %s"
,
s
.
c_str
());
return
unserialize
(
s
);
return
unserialize
(
s
);
}
}
...
...
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