audio: moved state file code to output_state.c

This commit is contained in:
Max Kellermann
2009-02-10 18:51:39 +01:00
parent f141d90533
commit 49ff2aceb5
6 changed files with 121 additions and 59 deletions

View File

@@ -31,9 +31,6 @@
#include <assert.h>
#include <stdlib.h>
#define AUDIO_DEVICE_STATE "audio_device_state:"
#define AUDIO_BUFFER_SIZE 2*MPD_PATH_MAX
static struct audio_format configured_audio_format;
static struct audio_format input_audio_format;
@@ -399,56 +396,6 @@ void printAudioDevices(struct client *client)
}
}
void saveAudioDevicesState(FILE *fp)
{
unsigned int i;
assert(audioOutputArraySize != 0);
for (i = 0; i < audioOutputArraySize; i++) {
fprintf(fp, AUDIO_DEVICE_STATE "%d:%s\n",
audioOutputArray[i].enabled,
audioOutputArray[i].name);
}
}
void readAudioDevicesState(FILE *fp)
{
char buffer[AUDIO_BUFFER_SIZE];
unsigned int i;
assert(audioOutputArraySize != 0);
while (fgets(buffer, sizeof(buffer), fp)) {
char *c, *name;
g_strchomp(buffer);
if (!g_str_has_prefix(buffer, AUDIO_DEVICE_STATE))
continue;
c = strchr(buffer, ':');
if (!c || !(++c))
goto errline;
name = strchr(c, ':');
if (!name || !(++name))
goto errline;
for (i = 0; i < audioOutputArraySize; ++i) {
if (!strcmp(name, audioOutputArray[i].name)) {
/* devices default to on */
if (!atoi(c))
audioOutputArray[i].enabled = false;
break;
}
}
continue;
errline:
/* nonfatal */
g_warning("invalid line in state_file: %s\n", buffer);
}
}
bool mixer_control_setvol(unsigned int device, int volume, int rel)
{
struct audio_output *output;