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
c941734c
Commit
c941734c
authored
16 years ago
by
Emmanuel Milou
Browse files
Options
Downloads
Patches
Plain Diff
Capture functional
parent
ee3d65e9
Branches
Branches containing commit
Tags
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
+21
-5
21 additions, 5 deletions
src/audio/alsalayer.cpp
src/audio/audiortp.cpp
+2
-2
2 additions, 2 deletions
src/audio/audiortp.cpp
with
23 additions
and
7 deletions
src/audio/alsalayer.cpp
+
21
−
5
View file @
c941734c
...
...
@@ -55,14 +55,26 @@ AlsaLayer::closeLayer()
{
_debugAlsa
(
"Close ALSA streams
\n
"
);
if
(
_audioThread
)
/* Stop the audio thread first */
try
{
if
(
_audioThread
)
{
_debug
(
"Try to stop audio thread
\n
"
);
delete
_audioThread
;
_audioThread
=
NULL
;
}
}
catch
(
...
)
{
_debug
(
"Try to stop a
udio
t
hread
\n
"
);
delete
_audioThread
;
_audioThread
=
NULL
;
_debug
Exception
(
"! A
udio
T
hread
Exception
\n
"
);
throw
;
}
/* Then close the audio devices */
closeCaptureStream
();
closePlaybackStream
();
_CaptureHandle
=
0
;
_PlaybackHandle
=
0
;
}
bool
...
...
@@ -373,8 +385,12 @@ AlsaLayer::open_device(std::string pcm_p, std::string pcm_c, int flag)
}
/* Start the secondary audio thread for callbacks */
_audioThread
->
start
();
try
{
_audioThread
->
start
();
}
catch
(...)
{
_debugException
(
"Fail to start audio thread
\n
"
);
}
return
true
;
}
...
...
This diff is collapsed.
Click to expand it.
src/audio/audiortp.cpp
+
2
−
2
View file @
c941734c
...
...
@@ -89,8 +89,8 @@ AudioRtp::closeRtpSession () {
_debugException
(
"! ARTP Exception: when stopping audiortp
\n
"
);
throw
;
}
//
AudioLayer* audiolayer = Manager::instance().getAudioDriver();
//
audiolayer->stopStream();
AudioLayer
*
audiolayer
=
Manager
::
instance
().
getAudioDriver
();
audiolayer
->
stopStream
();
}
////////////////////////////////////////////////////////////////////////////////
...
...
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