summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client_common.c2
-rw-r--r--error.h2
-rw-r--r--mixer.c1
3 files changed, 2 insertions, 3 deletions
diff --git a/client_common.c b/client_common.c
index 3a6255e9..398e577b 100644
--- a/client_common.c
+++ b/client_common.c
@@ -589,7 +589,7 @@ int client_open(int argc, char *argv[], struct client_task **ct_ptr,
if (ret < 0)
return ret;
if (ret == 0) {
- ret = -E_CLIENT_SYNTAX;
+ ret = -ERRNO_TO_PARA_ERROR(EINVAL);
goto fail;
}
ret = client_connect(*ct_ptr, sched, parent, child);
diff --git a/error.h b/error.h
index a4168051..a4bef41e 100644
--- a/error.h
+++ b/error.h
@@ -52,7 +52,6 @@
PARA_ERROR(BAD_SAMPLERATE, "sample rate not supported"), \
PARA_ERROR(BAD_SLICE_NUM, "invalid slice number"), \
PARA_ERROR(BAD_SLICE_SIZE, "slice size zero or too large"), \
- PARA_ERROR(BAD_TABLE_NAME, "invalid table"), \
PARA_ERROR(BAD_USER, "auth request for invalid user"), \
PARA_ERROR(BASE64, "failed to base64-decode ssh public key"), \
PARA_ERROR(BIGNUM, "bignum error"), \
@@ -62,7 +61,6 @@
PARA_ERROR(BTR_NO_CHILD, "btr node has no children"), \
PARA_ERROR(CHILD_CONTEXT, "now running in child context"), \
PARA_ERROR(CHMOD, "failed to set socket mode"), \
- PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
PARA_ERROR(CLIENT_WRITE, "client write error"), \
PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \
PARA_ERROR(CREATE_OPUS_DECODER, "could not create opus decoder"), \
diff --git a/mixer.c b/mixer.c
index 153cb80e..7c11c640 100644
--- a/mixer.c
+++ b/mixer.c
@@ -425,6 +425,7 @@ static int com_sleep(const struct mixer *m)
ret = change_mop(initial_mood, m, h);
if (ret < 0)
goto close_mixer;
+ audioc_cmd("on");
if (ret > 0) /* playing initial mood */
sleep(OPT_UINT32_VAL(SLEEP, INITIAL_DELAY));
ret = change_mop(fo_mood, m, h);