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
be13ffa0
Commit
be13ffa0
authored
16 years ago
by
Emmanuel Milou
Browse files
Options
Downloads
Patches
Plain Diff
Close ticket
#59
, change audio plugin during a conversation
disable the functionality
parent
cfc6a358
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/audio/alsalayer.cpp
+7
-1
7 additions, 1 deletion
src/audio/alsalayer.cpp
src/managerimpl.cpp
+5
-3
5 additions, 3 deletions
src/managerimpl.cpp
with
12 additions
and
4 deletions
src/audio/alsalayer.cpp
+
7
−
1
View file @
be13ffa0
...
...
@@ -59,6 +59,12 @@ AlsaLayer::closeLayer()
AlsaLayer
::
openDevice
(
int
indexIn
,
int
indexOut
,
int
sampleRate
,
int
frameSize
,
int
stream
,
std
::
string
plugin
)
{
// We don't accept that the audio plugin is changed during a conversation
if
(
_talk
){
_debug
(
"can't switch audio plugin when talking
\n
. Please hang up and try again...
\n
"
);
return
false
;
}
if
(
deviceClosed
==
false
)
{
if
(
stream
==
SFL_PCM_CAPTURE
)
...
...
@@ -694,4 +700,4 @@ AlsaLayer::adjustVolume( void* buffer , int len, int stream )
return
src
;
}
void
AlsaLayer
::
setPlaybackVolume
(
double
volume
){}
void
AlsaLayer
::
setPlaybackVolume
(
double
volume
UNUSED
){}
This diff is collapsed.
Click to expand it.
src/managerimpl.cpp
+
5
−
3
View file @
be13ffa0
...
...
@@ -1274,10 +1274,12 @@ ManagerImpl::setInputAudioPlugin(const std::string& audioPlugin)
void
ManagerImpl
::
setOutputAudioPlugin
(
const
std
::
string
&
audioPlugin
)
{
//int layer = _audiodriver -> getLayerType();
int
res
;
_debug
(
"Set output audio plugin
\n
"
);
_audiodriver
->
setErrorMessage
(
-
1
);
_audiodriver
->
openDevice
(
_audiodriver
->
getIndexIn
(),
res
=
_audiodriver
->
openDevice
(
_audiodriver
->
getIndexIn
(),
_audiodriver
->
getIndexOut
(),
_audiodriver
->
getSampleRate
(),
_audiodriver
->
getFrameSize
(),
...
...
@@ -1286,7 +1288,7 @@ ManagerImpl::setOutputAudioPlugin(const std::string& audioPlugin)
if
(
_audiodriver
->
getErrorMessage
()
!=
-
1
)
notifyErrClient
(
_audiodriver
->
getErrorMessage
()
);
// set config
setConfig
(
AUDIO
,
ALSA_PLUGIN
,
audioPlugin
);
if
(
res
)
setConfig
(
AUDIO
,
ALSA_PLUGIN
,
audioPlugin
);
}
/**
...
...
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