scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 12:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Core Audio: fixed previous commit

Browse Source
This commit is contained in:
Martin Pulec
2019-02-21 17:25:15 +01:00
parent f5112ca685
commit c8f0232ea7
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gpujpeg

Submodule gpujpeg updated: 39fc447801...fc73d3d15e

22
src/audio/playback/coreaudio.cpp
View File

@@ -171,8 +171,11 @@ static int audio_play_ca_reconfigure(void *state, struct audio_desc desc)
s->desc = desc;
s->buffer_fns->destroy(s->buffer);
s->buffer = NULL;
if (s->buffer_fns) {
s->buffer_fns->destroy(s->buffer);
s->buffer_fns = nullptr;
s->buffer = nullptr;
}
{
int buf_len_ms = 200; // 200 ms by default
@@ -304,12 +307,6 @@ static void * audio_play_ca_init(const char *cfg)
UInt32 size;
AudioDeviceID device;
if (get_commandline_param(CA_DIS_AD_B) == nullptr) {
LOG(LOG_LEVEL_WARNING) << MOD_NAME "Using adaptive buffer. "
"In case of problems, try \"--param " CA_DIS_AD_B "\" "
"option.\n";
}
s = new struct state_ca_playback();
//There are several different types of Audio Units.
@@ -369,6 +366,11 @@ static void * audio_play_ca_init(const char *cfg)
if(ret) goto error;
}
if (get_commandline_param(CA_DIS_AD_B) == nullptr) {
LOG(LOG_LEVEL_WARNING) << MOD_NAME "Using adaptive buffer. "
"In case of problems, try \"--param " CA_DIS_AD_B "\" "
"option.\n";
}
ret = AudioUnitSetProperty(s->auHALComponentInstance,
kAudioOutputUnitProperty_CurrentDevice,
@@ -400,7 +402,9 @@ static void audio_play_ca_done(void *state)
AudioOutputUnitStop(s->auHALComponentInstance);
AudioUnitUninitialize(s->auHALComponentInstance);
}
s->buffer_fns->destroy(s->buffer);
if (s->buffer_fns) {
s->buffer_fns->destroy(s->buffer);
}
delete s;
}