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
0137a3b7
Commit
0137a3b7
authored
Apr 15, 2010
by
Alexandre Savard
Browse files
Merge branch 'm_savard'
parents
a1ba3a26
ae80b534
Changes
2
Hide whitespace changes
Inline
Side-by-side
sflphone-client-gnome/src/actions.c
View file @
0137a3b7
...
...
@@ -1111,10 +1111,13 @@ void sflphone_fill_codec_list_per_account (account_t **account) {
order
=
(
gchar
**
)
dbus_get_active_codec_list
((
*
account
)
->
accountID
);
codeclist
=
(
*
account
)
->
codecs
;
// First clean the list
codec_list_clear
(
&
codeclist
);
// First clean the list
codec_list_clear
(
&
codeclist
);
for
(
pl
=
order
;
*
order
;
order
++
)
if
(
!
(
*
order
))
ERROR
(
"No codec list provided"
);
for
(
pl
=
order
;
*
order
;
order
++
)
{
codec_t
*
cpy
;
// Each account will have a copy of the system-wide capabilities
...
...
sflphone-common/src/audio/pulseaudio/pulselayer.cpp
View file @
0137a3b7
...
...
@@ -57,14 +57,14 @@ static void stream_moved_callback(pa_stream *s UNUSED, void *userdata UNUSED)
static
void
playback_underflow_callback
(
pa_stream
*
s
,
void
*
userdata
UNUSED
)
{
_debug
(
"Audio: Buffer Underflow"
);
pa_stream_trigger
(
s
,
NULL
,
NULL
);
//
_debug ("Audio: Buffer Underflow");
//
pa_stream_trigger (s, NULL, NULL);
}
static
void
playback_overflow_callback
(
pa_stream
*
s
UNUSED
,
void
*
userdata
UNUSED
)
{
_debug
(
"Audio: Buffer OverFlow"
);
//
_debug ("Audio: Buffer OverFlow");
}
...
...
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