diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-09-20 17:31:45 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-09-20 17:31:45 -0700 |
| commit | 77f98f37245f7d8ea2b0182b326420b6d6455cad (patch) | |
| tree | b38c6ec08ce8ab7b80f0f11e1739b7890c4a2b2a /src/audio.c | |
| parent | df1ed6f83043b7290d27b49c3c63fc8bcb796d5c (diff) | |
| parent | 228736ffb9d88a2910d7ae7df71827d12d7bfeb5 (diff) | |
| download | mpd-77f98f37245f7d8ea2b0182b326420b6d6455cad.tar.gz mpd-77f98f37245f7d8ea2b0182b326420b6d6455cad.tar.xz mpd-77f98f37245f7d8ea2b0182b326420b6d6455cad.zip | |
Merge branch 'ew/directory'
* ew/directory:
Don't try to prune unless we're updating
workaround race condition on updates with broken signal blocking
Replace SongList with struct songvec
directory: remove unused updateMp3Directory() function
start using prefixcmp()
Add prefixcmp() (stol^H^H^H^Hborrowed from git)
Diffstat (limited to '')
| -rw-r--r-- | src/audio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/audio.c b/src/audio.c index 5eacf7422..a10f5cf42 100644 --- a/src/audio.c +++ b/src/audio.c @@ -24,7 +24,6 @@ #include "os_compat.h" #define AUDIO_DEVICE_STATE "audio_device_state:" -#define AUDIO_DEVICE_STATE_LEN (sizeof(AUDIO_DEVICE_STATE)-1) #define AUDIO_BUFFER_SIZE 2*MPD_PATH_MAX static AudioFormat audio_format; @@ -483,7 +482,7 @@ void readAudioDevicesState(FILE *fp) while (myFgets(buffer, AUDIO_BUFFER_SIZE, fp)) { char *c, *name; - if (strncmp(buffer, AUDIO_DEVICE_STATE, AUDIO_DEVICE_STATE_LEN)) + if (prefixcmp(buffer, AUDIO_DEVICE_STATE)) continue; c = strchr(buffer, ':'); |