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
d600b937
Commit
d600b937
authored
Jun 08, 2017
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/Thread: move code to InternalDisable()
parent
ae713cb0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
Control.hxx
src/output/Control.hxx
+5
-0
Thread.cxx
src/output/Thread.cxx
+8
-2
No files found.
src/output/Control.hxx
View file @
d600b937
...
...
@@ -363,6 +363,11 @@ private:
/**
* Runs inside the OutputThread. Handles exceptions.
*/
void
InternalDisable
()
noexcept
;
/**
* Runs inside the OutputThread. Handles exceptions.
*/
void
InternalOpen
(
AudioFormat
audio_format
,
const
MusicPipe
&
pipe
)
noexcept
;
...
...
src/output/Thread.cxx
View file @
d600b937
...
...
@@ -204,6 +204,12 @@ AudioOutput::OpenOutputAndConvert(AudioFormat desired_audio_format)
}
inline
void
AudioOutputControl
::
InternalDisable
()
noexcept
{
output
->
Disable
();
}
inline
void
AudioOutputControl
::
InternalOpen
(
const
AudioFormat
audio_format
,
const
MusicPipe
&
pipe
)
noexcept
{
...
...
@@ -467,7 +473,7 @@ AudioOutputControl::Task()
break
;
case
Command
:
:
DISABLE
:
output
->
Disable
();
Internal
Disable
();
CommandFinished
();
break
;
...
...
@@ -520,7 +526,7 @@ AudioOutputControl::Task()
continue
;
case
Command
:
:
KILL
:
output
->
Disable
();
Internal
Disable
();
output
->
source
.
Cancel
();
CommandFinished
();
return
;
...
...
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