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
eec9ac2b
Commit
eec9ac2b
authored
13 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #9832: codecs: fix logging
parent
55a41c7c
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
daemon/src/audio/codecs/audiocodecfactory.cpp
+7
-7
7 additions, 7 deletions
daemon/src/audio/codecs/audiocodecfactory.cpp
with
7 additions
and
7 deletions
daemon/src/audio/codecs/audiocodecfactory.cpp
+
7
−
7
View file @
eec9ac2b
...
@@ -48,7 +48,7 @@ AudioCodecFactory::AudioCodecFactory() :
...
@@ -48,7 +48,7 @@ AudioCodecFactory::AudioCodecFactory() :
CodecVector
codecDynamicList
(
scanCodecDirectory
());
CodecVector
codecDynamicList
(
scanCodecDirectory
());
if
(
codecDynamicList
.
empty
())
if
(
codecDynamicList
.
empty
())
ERROR
(
"
Error -
No codecs available"
);
ERROR
(
"No codecs available"
);
else
{
else
{
for
(
CodecVector
::
const_iterator
iter
=
codecDynamicList
.
begin
();
for
(
CodecVector
::
const_iterator
iter
=
codecDynamicList
.
begin
();
iter
!=
codecDynamicList
.
end
()
;
++
iter
)
{
iter
!=
codecDynamicList
.
end
()
;
++
iter
)
{
...
@@ -99,7 +99,7 @@ AudioCodecFactory::getCodec(int payload) const
...
@@ -99,7 +99,7 @@ AudioCodecFactory::getCodec(int payload) const
if
(
iter
!=
codecsMap_
.
end
())
if
(
iter
!=
codecsMap_
.
end
())
return
iter
->
second
;
return
iter
->
second
;
else
{
else
{
ERROR
(
"C
odecDescriptor: c
annot find codec %i"
,
payload
);
ERROR
(
"Cannot find codec %i"
,
payload
);
return
NULL
;
return
NULL
;
}
}
}
}
...
@@ -166,7 +166,7 @@ std::vector<sfl::Codec*> AudioCodecFactory::scanCodecDirectory()
...
@@ -166,7 +166,7 @@ std::vector<sfl::Codec*> AudioCodecFactory::scanCodecDirectory()
for
(
size_t
i
=
0
;
i
<
dirToScan
.
size
()
;
i
++
)
{
for
(
size_t
i
=
0
;
i
<
dirToScan
.
size
()
;
i
++
)
{
std
::
string
dirStr
=
dirToScan
[
i
];
std
::
string
dirStr
=
dirToScan
[
i
];
DEBUG
(
"
CodecDescriptor:
Scanning %s to find audio codecs...."
,
dirStr
.
c_str
());
DEBUG
(
"Scanning %s to find audio codecs...."
,
dirStr
.
c_str
());
DIR
*
dir
=
opendir
(
dirStr
.
c_str
());
DIR
*
dir
=
opendir
(
dirStr
.
c_str
());
...
@@ -202,7 +202,7 @@ sfl::Codec* AudioCodecFactory::loadCodec(const std::string &path)
...
@@ -202,7 +202,7 @@ sfl::Codec* AudioCodecFactory::loadCodec(const std::string &path)
void
*
codecHandle
=
dlopen
(
path
.
c_str
()
,
RTLD_LAZY
);
void
*
codecHandle
=
dlopen
(
path
.
c_str
()
,
RTLD_LAZY
);
if
(
!
codecHandle
)
{
if
(
!
codecHandle
)
{
ERROR
(
"%s
\n
"
,
dlerror
());
ERROR
(
"%s"
,
dlerror
());
return
NULL
;
return
NULL
;
}
}
...
@@ -212,7 +212,7 @@ sfl::Codec* AudioCodecFactory::loadCodec(const std::string &path)
...
@@ -212,7 +212,7 @@ sfl::Codec* AudioCodecFactory::loadCodec(const std::string &path)
char
*
error
=
dlerror
();
char
*
error
=
dlerror
();
if
(
error
)
{
if
(
error
)
{
ERROR
(
"%s
\n
"
,
error
);
ERROR
(
"%s"
,
error
);
return
NULL
;
return
NULL
;
}
}
...
@@ -231,7 +231,7 @@ void AudioCodecFactory::unloadCodec(CodecHandlePointer p)
...
@@ -231,7 +231,7 @@ void AudioCodecFactory::unloadCodec(CodecHandlePointer p)
char
*
error
=
dlerror
();
char
*
error
=
dlerror
();
if
(
error
)
{
if
(
error
)
{
ERROR
(
"%s
\n
"
,
error
);
ERROR
(
"%s"
,
error
);
return
;
return
;
}
}
...
@@ -251,7 +251,7 @@ sfl::Codec* AudioCodecFactory::instantiateCodec(int payload) const
...
@@ -251,7 +251,7 @@ sfl::Codec* AudioCodecFactory::instantiateCodec(int payload) const
char
*
error
=
dlerror
();
char
*
error
=
dlerror
();
if
(
error
)
if
(
error
)
ERROR
(
"%s
\n
"
,
error
);
ERROR
(
"%s"
,
error
);
else
else
return
createCodec
();
return
createCodec
();
}
}
...
...
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