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] Mix_OpenAudioDevice patch

Mix_OpenAudioDevice.patch (text/plain), 2.93 KB, created by Francisco de la Peña on 2015-10-28 21:38:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francisco de la Peña

Created: 2015-10-28 21:38:06 UTC

Size: 2.93 KB

patch

obsolete

>diff -r 1aca2b6d570f SDL_mixer.h
>--- a/SDL_mixer.h	Sat Aug 01 21:58:32 2015 -0700
>+++ b/SDL_mixer.h	Wed Oct 28 14:26:05 2015 -0600
>@@ -132,6 +132,7 @@
> 
> /* Open the mixer with a certain audio format */
> extern DECLSPEC int SDLCALL Mix_OpenAudio(int frequency, Uint16 format, int channels, int chunksize);
>+extern DECLSPEC int SDLCALL Mix_OpenAudioDevice(const char *device, int iscapture, int frequency, Uint16 format, int channels, int chunksize, int allowed_changes);
> 
> /* Dynamically change the number of channels managed by the mixer.
>    If decreasing the number of channels, the upper channels are
>diff -r 1aca2b6d570f mixer.c
>--- a/mixer.c	Sat Aug 01 21:58:32 2015 -0700
>+++ b/mixer.c	Wed Oct 28 14:26:05 2015 -0600
>@@ -362,7 +362,7 @@
>                     }
> 
>                     mix_input = Mix_DoEffects(i, mix_channel[i].samples, mixable);
>-                    SDL_MixAudio(stream+index,mix_input,mixable,volume);
>+                    SDL_MixAudioFormat(stream+index,mix_input,mixer.format,mixable,volume);
>                     if (mix_input != mix_channel[i].samples)
>                         SDL_free(mix_input);
> 
>@@ -386,7 +386,7 @@
>                     }
> 
>                     mix_input = Mix_DoEffects(i, mix_channel[i].chunk->abuf, remaining);
>-                    SDL_MixAudio(stream+index, mix_input, remaining, volume);
>+                    SDL_MixAudioFormat(stream+index, mix_input, mixer.format, remaining, volume);
>                     if (mix_input != mix_channel[i].chunk->abuf)
>                         SDL_free(mix_input);
> 
>@@ -426,9 +426,15 @@
> }
> #endif
> 
>+int Mix_OpenAudio(int frequency, Uint16 format, int nchannels, int chunksize)
>+{
>+    return Mix_OpenAudioDevice(NULL, 0, frequency, format, nchannels, chunksize, SDL_AUDIO_ALLOW_ANY_CHANGE);
>+}
>+
>+SDL_AudioDeviceID dev;
> 
> /* Open the mixer with a certain desired audio format */
>-int Mix_OpenAudio(int frequency, Uint16 format, int nchannels, int chunksize)
>+int Mix_OpenAudioDevice(const char *device, int iscapture, int frequency, Uint16 format, int nchannels, int chunksize, int allowed_changes)
> {
>     int i;
>     SDL_AudioSpec desired;
>@@ -453,7 +459,8 @@
>     desired.userdata = NULL;
> 
>     /* Accept nearly any audio format */
>-    if ( SDL_OpenAudio(&desired, &mixer) < 0 ) {
>+    dev = SDL_OpenAudioDevice(device, iscapture, &desired, &mixer, allowed_changes);
>+    if (!dev) {
>         return(-1);
>     }
> #if 0
>@@ -462,7 +469,7 @@
> 
>     /* Initialize the music players */
>     if ( open_music(&mixer) < 0 ) {
>-        SDL_CloseAudio();
>+        SDL_CloseAudioDevice(dev);
>         return(-1);
>     }
> 
>@@ -502,7 +509,7 @@
> #endif
> 
>     audio_opened = 1;
>-    SDL_PauseAudio(0);
>+    SDL_PauseAudioDevice(dev, 0);
>     return(0);
> }
> 
>@@ -1186,7 +1193,7 @@
>             close_music();
>             Mix_HaltChannel(-1);
>             _Mix_DeinitEffects();
>-            SDL_CloseAudio();
>+            SDL_CloseAudioDevice(dev);
>             SDL_free(mix_channel);
>             mix_channel = NULL;

Actions: View | Diff

Attachments on bug 3160: 2292

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.