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
a50b2c3b
Commit
a50b2c3b
authored
May 23, 2017
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/Thread: rename {Play,Pause}() to Internal{Play,Pause}()
parent
ebecee3d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
Control.hxx
src/output/Control.hxx
+7
-2
Thread.cxx
src/output/Thread.cxx
+4
-4
No files found.
src/output/Control.hxx
View file @
a50b2c3b
...
...
@@ -370,12 +370,17 @@ private:
* been reached (and no more chunks are queued), or until a
* command is received.
*
* Runs inside the OutputThread. Handles exceptions.
*
* @return true if at least one chunk has been available,
* false if the tail of the pipe was already reached
*/
bool
Play
()
noexcept
;
bool
Internal
Play
()
noexcept
;
void
Pause
()
noexcept
;
/**
* Runs inside the OutputThread. Handles exceptions.
*/
void
InternalPause
()
noexcept
;
/**
* The OutputThread.
...
...
src/output/Thread.cxx
View file @
a50b2c3b
...
...
@@ -340,7 +340,7 @@ AudioOutputControl::PlayChunk() noexcept
}
inline
bool
AudioOutputControl
::
Play
()
noexcept
AudioOutputControl
::
Internal
Play
()
noexcept
{
if
(
!
FillSourceOrClose
())
/* no chunk available */
...
...
@@ -411,7 +411,7 @@ AudioOutput::IteratePause() noexcept
}
inline
void
AudioOutputControl
::
Pause
()
noexcept
AudioOutputControl
::
Internal
Pause
()
noexcept
{
output
->
BeginPause
();
CommandFinished
();
...
...
@@ -488,7 +488,7 @@ AudioOutputControl::Task()
break
;
}
Pause
();
Internal
Pause
();
/* don't "break" here: this might cause
Play() to be called when command==CLOSE
ends the paused state - "continue" checks
...
...
@@ -522,7 +522,7 @@ AudioOutputControl::Task()
return
;
}
if
(
output
->
open
&&
allow_play
&&
Play
())
if
(
output
->
open
&&
allow_play
&&
Internal
Play
())
/* don't wait for an event if there are more
chunks in the pipe */
continue
;
...
...
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