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
89a2e5de
Commit
89a2e5de
authored
Aug 07, 2017
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/Thread: rename InternalClose() to InternalCheckClose()
parent
9d6b4f46
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
Control.hxx
src/output/Control.hxx
+1
-1
Thread.cxx
src/output/Thread.cxx
+5
-5
No files found.
src/output/Control.hxx
View file @
89a2e5de
...
...
@@ -425,7 +425,7 @@ private:
/**
* Runs inside the OutputThread.
*/
void
InternalClose
(
bool
drain
)
noexcept
;
void
InternalC
heckC
lose
(
bool
drain
)
noexcept
;
/**
* Wait until the output's delay reaches zero.
...
...
src/output/Thread.cxx
View file @
89a2e5de
...
...
@@ -121,7 +121,7 @@ AudioOutputControl::InternalDisable() noexcept
if
(
!
really_enabled
)
return
;
InternalClose
(
false
);
InternalC
heckC
lose
(
false
);
really_enabled
=
false
;
output
->
Disable
();
...
...
@@ -172,7 +172,7 @@ AudioOutputControl::InternalOpen(const AudioFormat in_audio_format,
}
inline
void
AudioOutputControl
::
InternalClose
(
bool
drain
)
noexcept
AudioOutputControl
::
InternalC
heckC
lose
(
bool
drain
)
noexcept
{
if
(
!
IsOpen
())
return
;
...
...
@@ -211,7 +211,7 @@ try {
FormatError
(
e
,
"Failed to filter for output
\"
%s
\"
[%s]"
,
GetName
(),
output
->
plugin
.
name
);
InternalClose
(
false
);
InternalC
heckC
lose
(
false
);
/* don't automatically reopen this device for 10
seconds */
...
...
@@ -259,7 +259,7 @@ AudioOutputControl::PlayChunk() noexcept
}
if
(
nbytes
==
0
)
{
InternalClose
(
false
);
InternalC
heckC
lose
(
false
);
/* don't automatically reopen this device for
10 seconds */
...
...
@@ -380,7 +380,7 @@ AudioOutputControl::Task()
break
;
case
Command
:
:
CLOSE
:
InternalClose
(
false
);
InternalC
heckC
lose
(
false
);
CommandFinished
();
break
;
...
...
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