mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-03-14 04:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaked CoreAudioOut state flags to be more similar to most of the other

Browse Source 
outputs.
This commit is contained in:
casey langen 2016-12-24 12:49:05 -08:00
parent cfee726c02
commit 0184f1c8e8
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/contrib/coreaudioout/CoreAudioOut.cpp
View File

@ -91,7 +91,7 @@ void CoreAudioOut::NotifyBufferCompleted(BufferContext *context) {
CoreAudioOut::CoreAudioOut() {
this->quit = false;
this->paused = false;
this->state = StateStopped;
this->volume = 1.0f;
this->audioFormat = (AudioStreamBasicDescription) { 0 };
@ -108,13 +108,13 @@ CoreAudioOut::CoreAudioOut() {
this->audioFormat.mBytesPerFrame = -1;
this->audioFormat.mBytesPerPacket = -1;
this->audioQueue = NULL;
this->audioQueue = nullptr;
}
bool CoreAudioOut::Play(IBuffer *buffer, IBufferProvider *provider) {
boost::recursive_mutex::scoped_lock lock(this->mutex);
if (this->paused) {
if (this->state != StatePlaying) {
return false;
}
@ -128,7 +128,7 @@ bool CoreAudioOut::Play(IBuffer *buffer, IBufferProvider *provider) {
if (buffer->SampleRate() != this->audioFormat.mSampleRate ||
buffer->Channels() != this->audioFormat.mChannelsPerFrame ||
this->audioQueue == NULL)
this->audioQueue == nullptr)
{
this->audioFormat.mSampleRate = buffer->SampleRate();
this->audioFormat.mChannelsPerFrame = buffer->Channels();
@ -141,7 +141,7 @@ bool CoreAudioOut::Play(IBuffer *buffer, IBufferProvider *provider) {
&this->audioFormat,
audioCallback,
this,
NULL,
nullptr,
kCFRunLoopCommonModes,
0,
&this->audioQueue);
@ -151,7 +151,7 @@ bool CoreAudioOut::Play(IBuffer *buffer, IBufferProvider *provider) {
return false;
}
result = AudioQueueStart(this->audioQueue, NULL);
result = AudioQueueStart(this->audioQueue, nullptr);
this->SetVolume(volume);
@ -161,7 +161,7 @@ bool CoreAudioOut::Play(IBuffer *buffer, IBufferProvider *provider) {
}
}
AudioQueueBufferRef audioQueueBuffer = NULL;
AudioQueueBufferRef audioQueueBuffer = nullptr;
size_t bytes = buffer->Bytes();
@ -185,7 +185,7 @@ bool CoreAudioOut::Play(IBuffer *buffer, IBufferProvider *provider) {
bytes);
result = AudioQueueEnqueueBuffer(
this->audioQueue, audioQueueBuffer, 0, NULL);
this->audioQueue, audioQueueBuffer, 0, nullptr);
if (result != 0) {
std::cerr << "AudioQueueEnqueueBuffer failed: " << result << "\n";
@ -211,7 +211,7 @@ void CoreAudioOut::Pause() {
if (this->audioQueue) {
AudioQueuePause(this->audioQueue);
this->paused = true;
this->state = StatePaused;
}
}
@ -219,8 +219,8 @@ void CoreAudioOut::Resume() {
boost::recursive_mutex::scoped_lock lock(this->mutex);
if (this->audioQueue) {
AudioQueueStart(this->audioQueue, NULL);
this->paused = false;
AudioQueueStart(this->audioQueue, nullptr);
this->state = StatePlaying;
}
}
@ -246,7 +246,7 @@ double CoreAudioOut::GetVolume() {
}
void CoreAudioOut::Stop() {
AudioQueueRef queue = NULL;
AudioQueueRef queue = nullptr;
{
/* AudioQueueStop/AudioQueueDispose will trigger the callback, which
@ -254,7 +254,8 @@ void CoreAudioOut::Stop() {
cache the queue and reset outside of the critical section */
boost::recursive_mutex::scoped_lock lock(this->mutex);
queue = this->audioQueue;
this->audioQueue = NULL;
this->audioQueue = nullptr;
this->state = STateStopped;
}
if (queue) {

8
src/contrib/coreaudioout/CoreAudioOut.h
View File

@ -75,6 +75,12 @@ class CoreAudioOut : public musik::core::sdk::IOutput {
void NotifyBufferCompleted(BufferContext *context);
private:
enum State {
StateStopped,
StatePaused,
StatePlaying
};
AudioStreamBasicDescription audioFormat;
AudioQueueRef audioQueue;
double volume;
@ -82,5 +88,5 @@ class CoreAudioOut : public musik::core::sdk::IOutput {
boost::thread thread;
boost::recursive_mutex mutex;
bool quit;
bool paused;
State state;
};