diff options
| author | Andre Noll <maan@tuebingen.mpg.de> | 2026-08-23 23:58:32 +0200 |
|---|---|---|
| committer | Andre Noll <maan@tuebingen.mpg.de> | 2026-08-23 23:58:32 +0200 |
| commit | 505aaad4136bc0a98de4e322c172ce70a1c9b070 (patch) | |
| tree | cb3f0c3faaf86cb2d44e0700b9ee4d47ab9ccee2 | |
| parent | 4ce495ddd9d903ee535074f9f9e3c7913430ada2 (diff) | |
| parent | cc3d12665f843111fdfacfe724b20ff0b6b92582 (diff) | |
Merge topic branch t/misc into pupu
Smallish changes for master
---------------------------
The stuff in here is too small to get its own topic branch. The commits are
generally regarded as safe enough to be applied directly to "master" without
cooking in "next" first. However, if a commit is important enough to get an
item in the NEWS file, the commit should go into a dedicated topic branch.
Unlike most other topic branches, this branch never promotes to "next". When
a set of commits is ready to graduate to "master", the branch is rebased
onto "master" and the commits of the branch are re-ordered so that the
graduating commits appear at the beginning. The last such commit is then
merged into "master". Thanks to the rebase operation, this always results
in a fast-forward merge.
* t/misc:
Remove unused E_BAD_TABLE_NAME.
Kill E_CLIENT_SYNTAX.
mixer sleep: Turn on audiod at startup.
| -rw-r--r-- | client_common.c | 2 | ||||
| -rw-r--r-- | error.h | 2 | ||||
| -rw-r--r-- | mixer.c | 1 |
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); @@ -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"), \ @@ -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); |
