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
4d7f1f0c
Commit
4d7f1f0c
authored
Mar 07, 2018
by
Christian Kröner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement Pause() for OSXOutput plugin
parent
d3f097c7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
2 deletions
+21
-2
OSXOutputPlugin.cxx
src/output/plugins/OSXOutputPlugin.cxx
+21
-2
No files found.
src/output/plugins/OSXOutputPlugin.cxx
View file @
4d7f1f0c
...
...
@@ -49,6 +49,7 @@ struct OSXOutput final : AudioOutput {
const
char
*
channel_map
;
bool
hog_device
;
bool
sync_sample_rate
;
bool
pause
;
#ifdef ENABLE_DSD
/**
* Enable DSD over PCM according to the DoP standard?
...
...
@@ -81,6 +82,7 @@ private:
std
::
chrono
::
steady_clock
::
duration
Delay
()
const
noexcept
override
;
size_t
Play
(
const
void
*
chunk
,
size_t
size
)
override
;
bool
Pause
()
override
;
};
static
constexpr
Domain
osx_output_domain
(
"osx_output"
);
...
...
@@ -108,7 +110,7 @@ osx_output_test_default_device(void)
}
OSXOutput
::
OSXOutput
(
const
ConfigBlock
&
block
)
:
AudioOutput
(
FLAG_ENABLE_DISABLE
)
:
AudioOutput
(
FLAG_ENABLE_DISABLE
|
FLAG_PAUSE
)
{
const
char
*
device
=
block
.
GetBlockValue
(
"device"
);
...
...
@@ -763,12 +765,21 @@ OSXOutput::Open(AudioFormat &audio_format)
throw
FormatRuntimeError
(
"unable to start audio output: %s"
,
errormsg
);
}
pause
=
false
;
}
size_t
OSXOutput
::
Play
(
const
void
*
chunk
,
size_t
size
)
{
assert
(
size
>
0
);
if
(
pause
)
{
pause
=
false
;
OSStatus
status
=
AudioOutputUnitStart
(
au
);
if
(
status
!=
0
)
{
AudioUnitUninitialize
(
au
);
throw
std
::
runtime_error
(
"Unable to restart audio output after pause"
);
}
}
const
auto
e
=
pcm_export
->
Export
({
chunk
,
size
});
if
(
e
.
size
==
0
)
/* the DoP (DSD over PCM) filter converts two frames
...
...
@@ -791,7 +802,15 @@ OSXOutput::Delay() const noexcept
?
std
::
chrono
::
steady_clock
::
duration
::
zero
()
:
std
::
chrono
::
milliseconds
(
MPD_OSX_BUFFER_TIME_MS
/
4
);
}
bool
OSXOutput
::
Pause
()
{
if
(
!
pause
)
{
pause
=
true
;
AudioOutputUnitStop
(
au
);
}
return
true
;
}
int
osx_output_get_volume
(
OSXOutput
&
output
)
{
...
...
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