Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
09eb0d6c
Commit
09eb0d6c
authored
Apr 01, 2010
by
Alexandre Savard
Browse files
[#2926] Code cleanup
parent
3022570b
Changes
3
Hide whitespace changes
Inline
Side-by-side
sflphone-common/src/audio/codecs/codecDescriptor.cpp
View file @
09eb0d6c
...
...
@@ -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
;
...
...
sflphone-common/src/dbus/configurationmanager.cpp
View file @
09eb0d6c
...
...
@@ -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:
:set
Active
C
odec
L
ist received"
);
_debug
(
"ConfigurationManager:
Active
c
odec
l
ist 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
);
}
...
...
sflphone-common/src/managerimpl.cpp
View file @
09eb0d6c
...
...
@@ -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
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment