mirror of
https://github.com/ClassiCube/ClassiCube.git
synced 2025-09-15 10:35:11 -04:00
Android: Mute music volume when window is lost (Thanks 123DMWM)
This is far from ideal since music should be paused not muted, but it's a starting point
This commit is contained in:
parent
302415fcb0
commit
ef6ed0f764
@ -920,6 +920,11 @@ static cc_result Music_Buffer(int i, cc_int16* data, int maxSamples, struct Vorb
|
|||||||
samples += Vorbis_OutputFrame(ctx, cur);
|
samples += Vorbis_OutputFrame(ctx, cur);
|
||||||
}
|
}
|
||||||
if (Audio_MusicVolume < 100) { Volume_Mix16(data, samples, Audio_MusicVolume); }
|
if (Audio_MusicVolume < 100) { Volume_Mix16(data, samples, Audio_MusicVolume); }
|
||||||
|
#ifdef CC_BUILD_ANDROID
|
||||||
|
/* Don't play music while in the background on Android */
|
||||||
|
/* TODO: Not use such a terrible approach */
|
||||||
|
if (!WindowInfo.Handle) { int i; for (i = 0; i < samples; i++) data[i] = 0; }
|
||||||
|
#endif
|
||||||
|
|
||||||
res2 = Audio_BufferData(&music_ctx, i, data, samples * 2);
|
res2 = Audio_BufferData(&music_ctx, i, data, samples * 2);
|
||||||
if (res2) { music_pendingStop = true; return res2; }
|
if (res2) { music_pendingStop = true; return res2; }
|
||||||
@ -963,10 +968,6 @@ static cc_result Music_PlayOgg(struct Stream* source) {
|
|||||||
if (res) goto cleanup;
|
if (res) goto cleanup;
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
#if 0
|
|
||||||
/* Don't play music while in the background on Android */
|
|
||||||
if (!WindowInfo.Handle && !music_pendingStop) { Thread_Sleep(10); continue; }
|
|
||||||
#endif
|
|
||||||
next = -1;
|
next = -1;
|
||||||
|
|
||||||
for (i = 0; i < AUDIO_MAX_BUFFERS; i++) {
|
for (i = 0; i < AUDIO_MAX_BUFFERS; i++) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user