Commit b3c82f88 authored by Max Kellermann's avatar Max Kellermann

output/{osx,haiku,pulse,sles}: add missing "noexcept"

Fixes build failure on OS X, closes #44. With the other plugins, that's not critical, because those use the AudioOutputWrapper, which hides this problem.
parent 063259dc
ver 0.20.8 (not yet released) ver 0.20.8 (not yet released)
* output
- osx: fix build failure due to missing "noexcept"
ver 0.20.7 (2017/05/15) ver 0.20.7 (2017/05/15)
* database * database
......
...@@ -79,7 +79,7 @@ public: ...@@ -79,7 +79,7 @@ public:
size_t Play(const void *chunk, size_t size); size_t Play(const void *chunk, size_t size);
void Cancel(); void Cancel();
std::chrono::steady_clock::duration Delay(); std::chrono::steady_clock::duration Delay() noexcept;
void FillBuffer(void* _buffer, size_t size, void FillBuffer(void* _buffer, size_t size,
gcc_unused const media_raw_audio_format& _format); gcc_unused const media_raw_audio_format& _format);
...@@ -309,7 +309,7 @@ HaikuOutput::Play(const void *chunk, size_t size) ...@@ -309,7 +309,7 @@ HaikuOutput::Play(const void *chunk, size_t size)
} }
inline std::chrono::steady_clock::duration inline std::chrono::steady_clock::duration
HaikuOutput::Delay() HaikuOutput::Delay() noexcept
{ {
unsigned delay = buffer_filled ? 0 : buffer_delay; unsigned delay = buffer_filled ? 0 : buffer_delay;
......
...@@ -670,7 +670,7 @@ osx_output_play(AudioOutput *ao, const void *chunk, size_t size) ...@@ -670,7 +670,7 @@ osx_output_play(AudioOutput *ao, const void *chunk, size_t size)
} }
static std::chrono::steady_clock::duration static std::chrono::steady_clock::duration
osx_output_delay(AudioOutput *ao) osx_output_delay(AudioOutput *ao) noexcept
{ {
OSXOutput *od = (OSXOutput *)ao; OSXOutput *od = (OSXOutput *)ao;
return od->ring_buffer->write_available() return od->ring_buffer->write_available()
......
...@@ -100,7 +100,7 @@ public: ...@@ -100,7 +100,7 @@ public:
void Open(AudioFormat &audio_format); void Open(AudioFormat &audio_format);
void Close(); void Close();
std::chrono::steady_clock::duration Delay(); std::chrono::steady_clock::duration Delay() noexcept;
size_t Play(const void *chunk, size_t size); size_t Play(const void *chunk, size_t size);
void Cancel(); void Cancel();
bool Pause(); bool Pause();
...@@ -740,7 +740,7 @@ PulseOutput::StreamPause(bool pause) ...@@ -740,7 +740,7 @@ PulseOutput::StreamPause(bool pause)
} }
inline std::chrono::steady_clock::duration inline std::chrono::steady_clock::duration
PulseOutput::Delay() PulseOutput::Delay() noexcept
{ {
Pulse::LockGuard lock(mainloop); Pulse::LockGuard lock(mainloop);
......
...@@ -96,7 +96,7 @@ public: ...@@ -96,7 +96,7 @@ public:
void Open(AudioFormat &audio_format); void Open(AudioFormat &audio_format);
void Close(); void Close();
std::chrono::steady_clock::duration Delay() { std::chrono::steady_clock::duration Delay() noexcept {
return pause && !cancel return pause && !cancel
? std::chrono::milliseconds(100) ? std::chrono::milliseconds(100)
: std::chrono::steady_clock::duration::zero(); : std::chrono::steady_clock::duration::zero();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment