We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch

CoreAudio.diff (text/plain), 2.38 KB, created by Dominik Reichardt on 2015-09-21 21:15:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dominik Reichardt

Created: 2015-09-21 21:15:34 UTC

Size: 2.38 KB

patch

obsolete

>diff --git a/src/audio/coreaudio/SDL_coreaudio.c b/src/audio/coreaudio/SDL_coreaudio.c
>--- a/src/audio/coreaudio/SDL_coreaudio.c
>+++ b/src/audio/coreaudio/SDL_coreaudio.c
>@@ -406,13 +406,7 @@
>             AudioUnitSetProperty(this->hidden->audioUnit,
>                                  kAudioUnitProperty_SetRenderCallback,
>                                  scope, bus, &callback, sizeof(callback));
>-
>-            #if MACOSX_COREAUDIO
>-            CloseComponent(this->hidden->audioUnit);
>-            #else
>             AudioComponentInstanceDispose(this->hidden->audioUnit);
>-            #endif
>-
>             this->hidden->audioUnitOpened = 0;
>         }
>         SDL_free(this->hidden->buffer);
>@@ -482,13 +476,8 @@
> {
>     OSStatus result = noErr;
>     AURenderCallbackStruct callback;
>-#if MACOSX_COREAUDIO
>-    ComponentDescription desc;
>-    Component comp = NULL;
>-#else
>     AudioComponentDescription desc;
>     AudioComponent comp = NULL;
>-#endif
>     const AudioUnitElement output_bus = 0;
>     const AudioUnitElement input_bus = 1;
>     const AudioUnitElement bus = ((iscapture) ? input_bus : output_bus);
>@@ -507,11 +496,10 @@
> 
> #if MACOSX_COREAUDIO
>     desc.componentSubType = kAudioUnitSubType_DefaultOutput;
>-    comp = FindNextComponent(NULL, &desc);
> #else
>     desc.componentSubType = kAudioUnitSubType_RemoteIO;
>+#endif
>     comp = AudioComponentFindNext(NULL, &desc);
>-#endif
> 
>     if (comp == NULL) {
>         SDL_SetError("Couldn't find requested CoreAudio component");
>@@ -519,17 +507,12 @@
>     }
> 
>     /* Open & initialize the audio unit */
>-#if MACOSX_COREAUDIO
>-    result = OpenAComponent(comp, &this->hidden->audioUnit);
>-    CHECK_RESULT("OpenAComponent");
>-#else
>     /*
>        AudioComponentInstanceNew only available on iPhone OS 2.0 and Mac OS X 10.6
>        We can't use OpenAComponent on iPhone because it is not present
>      */
>     result = AudioComponentInstanceNew(comp, &this->hidden->audioUnit);
>     CHECK_RESULT("AudioComponentInstanceNew");
>-#endif
> 
>     this->hidden->audioUnitOpened = 1;
> 
>diff --git a/src/audio/coreaudio/SDL_coreaudio.h b/src/audio/coreaudio/SDL_coreaudio.h
>--- a/src/audio/coreaudio/SDL_coreaudio.h
>+++ b/src/audio/coreaudio/SDL_coreaudio.h
>@@ -32,9 +32,9 @@
> #if MACOSX_COREAUDIO
> #include <CoreAudio/CoreAudio.h>
> #include <CoreServices/CoreServices.h>
>-#else
>+#endif
> #include <AudioToolbox/AudioToolbox.h>
>-#endif
>+
> 
> #include <AudioUnit/AudioUnit.h>
>

Actions: View | Diff

Attachments on bug 3127: 2271 | 2272 | 2273 | 2274

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.