Renamed states

diff --git a/src/Makefile.am b/src/Makefile.am
index 86b41e759d889e537ecc0263ffe404076ceff82c..ab9917416e1d65266d7e034cf665a56bd2018c66 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ libasound_la_SOURCES = error.c
 libasound_la_LIBADD = control/libcontrol.la mixer/libmixer.la pcm/libpcm.la \
                       rawmidi/librawmidi.la timer/libtimer.la \
                      hwdep/libhwdep.la seq/libseq.la instr/libinstr.la \
-                     compat/libcompat.la conf/libconf.la -lm -ldl
+                     compat/libcompat.la conf/libconf.la -lm -ldl -lpthread
 
 libasound_la_LDFLAGS = -version-info $(COMPATNUM)
 

diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
index 6bcf50c22e00d04c28676628785700739205d711..e40e5e573b94e81e3c59eac6fd06638ce6188897 100644 (file)
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -381,7 +381,7 @@ static const char *assoc(int value, assoc_t *alist)
 #define FILL(v) { SND_PCM_FILL_##v, #v, #v }
 #define END { 0, NULL, NULL }
 
-static assoc_t states[] = { STATE(NOTREADY), STATE(READY), STATE(PREPARED),
+static assoc_t states[] = { STATE(OPEN), STATE(SETUP), STATE(PREPARED),
                            STATE(RUNNING), STATE(XRUN), STATE(PAUSED), END };
 static assoc_t streams[] = { STREAM(PLAYBACK), STREAM(CAPTURE), END };
 static assoc_t xruns[] = { XRUN(ASAP), XRUN(FRAGMENT), XRUN(NONE), END };