Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 05:27:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] audio: always store the volume & mute state for restore

Browse Source
This commit is contained in:
Geoffrey McRae 2022-01-06 23:31:39 +11:00
parent a114ea3de4
commit ff2ca20235
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
client/src/audio.c
View File

@ -19,6 +19,9 @@
*/ */
#include "main.h" #include "main.h"
#include "common/array.h"
#include "common/util.h"
#include "dynamic/audiodev.h" #include "dynamic/audiodev.h"
#include <string.h> #include <string.h>
@ -29,12 +32,21 @@ typedef struct
struct struct
{ {
bool started; bool started;
int volumeChannels; int volumeChannels;
uint16_t * volume; uint16_t volume[8];
bool mute; bool mute;
} }
playback; playback;
struct
{
bool started;
int volumeChannels;
uint16_t volume[8];
bool mute;
}
record;
} }
AudioState; AudioState;
@ -61,9 +73,6 @@ void audio_free(void)
audio.audioDev->free(); audio.audioDev->free();
audio.audioDev = NULL; audio.audioDev = NULL;
free(audio.playback.volume);
audio.playback.volume = NULL;
} }
void audio_playbackStart(int channels, int sampleRate, PSAudioFormat format, void audio_playbackStart(int channels, int sampleRate, PSAudioFormat format,
@ -91,7 +100,7 @@ void audio_playbackStart(int channels, int sampleRate, PSAudioFormat format,
audio.audioDev->playback.start(channels, sampleRate); audio.audioDev->playback.start(channels, sampleRate);
// if a volume level was stored, set it before we return // if a volume level was stored, set it before we return
if (audio.playback.volume) if (audio.playback.volumeChannels)
audio.audioDev->playback.volume( audio.audioDev->playback.volume(
audio.playback.volumeChannels, audio.playback.volumeChannels,
audio.playback.volume); audio.playback.volume);
@ -114,18 +123,13 @@ void audio_playbackVolume(int channels, const uint16_t volume[])
if (!audio.audioDev || !audio.audioDev->playback.volume) if (!audio.audioDev || !audio.audioDev->playback.volume)
return; return;
// if playback has not started yet, store the volume levels for later // store the values so we can restore the state if the stream is restarted
channels = min(ARRAY_LENGTH(audio.playback.volume), channels);
memcpy(audio.playback.volume, volume, sizeof(uint16_t) * channels);
audio.playback.volumeChannels = channels;
if (!audio.playback.started) if (!audio.playback.started)
{
if (audio.playback.volumeChannels < channels)
{
free(audio.playback.volume);
audio.playback.volume = malloc(sizeof(uint16_t) * channels);
}
memcpy(audio.playback.volume, volume, sizeof(uint16_t) * channels);
audio.playback.volumeChannels = channels;
return; return;
}
audio.audioDev->playback.volume(channels, volume); audio.audioDev->playback.volume(channels, volume);
} }
@ -135,12 +139,10 @@ void audio_playbackMute(bool mute)
if (!audio.audioDev || !audio.audioDev->playback.mute) if (!audio.audioDev || !audio.audioDev->playback.mute)
return; return;
// if playback has not yet started, store the mute status for later // store the value so we can restore it if the stream is restarted
audio.playback.mute = mute;
if (!audio.playback.started) if (!audio.playback.started)
{
audio.playback.mute = mute;
return; return;
}
audio.audioDev->playback.mute(mute); audio.audioDev->playback.mute(mute);
} }