diff options
author | Max Kellermann <max@duempel.org> | 2009-02-10 18:51:39 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-02-10 18:51:39 +0100 |
commit | 49ff2aceb5c7fd1959a2f25f740ecd4e5b5f08cc (patch) | |
tree | 6e7ef46aa9b2db122d67557b454a7bc48eeb5921 /src/audio.c | |
parent | f141d9053396e6bd177c8f46095098fc573f0ab0 (diff) | |
download | mpd-49ff2aceb5c7fd1959a2f25f740ecd4e5b5f08cc.tar.gz mpd-49ff2aceb5c7fd1959a2f25f740ecd4e5b5f08cc.tar.xz mpd-49ff2aceb5c7fd1959a2f25f740ecd4e5b5f08cc.zip |
audio: moved state file code to output_state.c
Diffstat (limited to 'src/audio.c')
-rw-r--r-- | src/audio.c | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/src/audio.c b/src/audio.c index e048a0b6f..ef62ef958 100644 --- a/src/audio.c +++ b/src/audio.c @@ -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; |