mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-03-29 19:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed macOS compile.

Browse Source
This commit is contained in:
Casey Langen 2020-10-31 17:15:56 -07:00
parent e141f7d555
commit e0a2da7102
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/coreaudioout/CoreAudioOut.cpp
View File

@ -133,17 +133,17 @@ CoreAudioOut::CoreAudioOut() {
this->bufferCount = 0;
}
int CoreAudioOut::Play(IBuffer *buffer, IBufferProvider *provider) {
OutputState CoreAudioOut::Play(IBuffer *buffer, IBufferProvider *provider) {
std::unique_lock<std::recursive_mutex> lock(this->mutex);
if (this->state != StatePlaying) {
return OutputInvalidState;
return OutputState::InvalidState;
}
if (this->bufferCount >= BUFFER_COUNT) {
/* enough buffers are already in the queue. bail, we'll notify the
caller when there's more data available */
return OutputBufferFull;
return OutputState::BufferFull;
}
OSStatus result;
@ -173,7 +173,7 @@ int CoreAudioOut::Play(IBuffer *buffer, IBufferProvider *provider) {
if (result != 0) {
std::cerr << "AudioQueueNewOutput failed: " << result << "\n";
return OutputInvalidState;
return OutputState::InvalidState;
}
/* after the queue is created, but before it's started, let's make
@ -207,7 +207,7 @@ int CoreAudioOut::Play(IBuffer *buffer, IBufferProvider *provider) {
if (result != 0) {
std::cerr << "AudioQueueStart failed: " << result << "\n";
return OutputInvalidState;
return OutputState::InvalidState;
}
this->Resume();
@ -225,7 +225,7 @@ int CoreAudioOut::Play(IBuffer *buffer, IBufferProvider *provider) {
if (result != 0) {
std::cerr << "AudioQueueAllocateBuffer failed: " << result << "\n";
return OutputInvalidState;
return OutputState::InvalidState;
}
audioQueueBuffer->mUserData = (void *) context;
@ -242,12 +242,12 @@ int CoreAudioOut::Play(IBuffer *buffer, IBufferProvider *provider) {
if (result != 0) {
std::cerr << "AudioQueueEnqueueBuffer failed: " << result << "\n";
delete context;
return OutputInvalidState;
return OutputState::InvalidState;
}
++bufferCount;
return OutputBufferWritten;
return OutputState::BufferWritten;
}
CoreAudioOut::~CoreAudioOut() {

2
src/plugins/coreaudioout/CoreAudioOut.h
View File

@ -67,7 +67,7 @@ class CoreAudioOut : public musik::core::sdk::IOutput {
virtual double Latency() override { return 0.0; }
virtual void Drain() override;
virtual int Play(
virtual musik::core::sdk::OutputState Play(
musik::core::sdk::IBuffer *buffer,
musik::core::sdk::IBufferProvider *provider) override;

2
src/plugins/macosmediakeys/plugin.mm
View File

@ -110,7 +110,7 @@ class PlaybackRemote: public IPlaybackRemote, IKeyProcessor {
switch (keyCode) {
case NX_KEYTYPE_PLAY: {
auto state = this->playback->GetPlaybackState();
if (state == PlaybackStopped) {
if (state == PlaybackState::Stopped) {
if (this->playback->Count()) {
this->playback->Play(0);
}