Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
05417049
Commit
05417049
authored
Jan 13, 2017
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
input/alsa: clear sockets from within IOThread
Fixes assertion failure in implicit destructor.
parent
c7b0c46d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
NEWS
NEWS
+2
-0
AlsaInputPlugin.cxx
src/input/plugins/AlsaInputPlugin.cxx
+9
-0
No files found.
NEWS
View file @
05417049
ver 0.20.2 (not yet released)
ver 0.20.2 (not yet released)
* input
- alsa: fix crash bug
* decoder
* decoder
- flac: add options "probesize" and "analyzeduration"
- flac: add options "probesize" and "analyzeduration"
* resampler
* resampler
...
...
src/input/plugins/AlsaInputPlugin.cxx
View file @
05417049
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
#include "AlsaInputPlugin.hxx"
#include "AlsaInputPlugin.hxx"
#include "../InputPlugin.hxx"
#include "../InputPlugin.hxx"
#include "../AsyncInputStream.hxx"
#include "../AsyncInputStream.hxx"
#include "event/Call.hxx"
#include "util/Domain.hxx"
#include "util/Domain.hxx"
#include "util/RuntimeError.hxx"
#include "util/RuntimeError.hxx"
#include "util/StringCompare.hxx"
#include "util/StringCompare.hxx"
...
@@ -99,6 +100,14 @@ public:
...
@@ -99,6 +100,14 @@ public:
}
}
~
AlsaInputStream
()
{
~
AlsaInputStream
()
{
/* ClearSocketList must be called from within the
IOThread; if we don't do it manually here, the
~MultiSocketMonitor() will do it in the current
thread */
BlockingCall
(
MultiSocketMonitor
::
GetEventLoop
(),
[
this
](){
ClearSocketList
();
});
snd_pcm_close
(
capture_handle
);
snd_pcm_close
(
capture_handle
);
}
}
...
...
Write
Preview
Markdown
is supported
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