mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-tunnel: translate pulse error to spa error

Browse source 
Pulseaudio has its own error enumeration, convert them to spa errors so
that we report the right errors.
This commit is contained in:
Wim Taymans 2023-03-13 12:26:20 +01:00
parent 59d5d93878
commit bc6c19ccdf
2 changed files with 40 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/modules/module-protocol-pulse/defs.h
View file

@ -116,6 +116,44 @@ static inline int res_to_err(int res)
return ERR_UNKNOWN; return ERR_UNKNOWN;
} }
static inline int err_to_res(int err)
{
switch (err) {
case ERR_OK: return 0;
case ERR_ACCESS: return -EACCES;
case ERR_COMMAND: return -ENOTTY;
case ERR_INVALID: return -EINVAL;
case ERR_EXIST: return -EEXIST;
case ERR_NOENTITY: return -ENOENT;
case ERR_CONNECTIONREFUSED: return -ECONNREFUSED;
case ERR_PROTOCOL: return -EPROTO;
case ERR_TIMEOUT: return -ETIMEDOUT;
#ifdef ENOKEY
case ERR_AUTHKEY: return -ENOKEY;
#endif
case ERR_INTERNAL: return -ENFILE;
case ERR_CONNECTIONTERMINATED: return -ECONNRESET;
case ERR_KILLED: return -EFAULT;
case ERR_INVALIDSERVER: return -EINVAL;
case ERR_MODINITFAILED: return -EIO;
#ifdef EBADFD
case ERR_BADSTATE: return -EBADFD;
#endif
case ERR_NODATA: return -ENODATA;
case ERR_VERSION: return -EPROTO;
case ERR_TOOLARGE: return -E2BIG;
case ERR_NOTSUPPORTED: return -ENOTSUP;
case ERR_UNKNOWN: return -EIO;
case ERR_NOEXTENSION: return -ENOTTY;
case ERR_OBSOLETE: return -ENOTSUP;
case ERR_NOTIMPLEMENTED: return -ENOSYS;
case ERR_FORKED: return -EIO;
case ERR_IO: return -EIO;
case ERR_BUSY: return -EBUSY;
}
return -EIO;
}
enum { enum {
SUBSCRIPTION_MASK_NULL = 0x0000U, SUBSCRIPTION_MASK_NULL = 0x0000U,
SUBSCRIPTION_MASK_SINK = 0x0001U, SUBSCRIPTION_MASK_SINK = 0x0001U,

3
src/modules/module-pulse-tunnel.c
View file

@ -32,6 +32,7 @@
#include <pipewire/private.h> #include <pipewire/private.h>
#include <pulse/pulseaudio.h> #include <pulse/pulseaudio.h>
#include "module-protocol-pulse/defs.h"
#include "module-protocol-pulse/format.h" #include "module-protocol-pulse/format.h"
/** \page page_module_pulse_tunnel PipeWire Module: Pulse Tunnel /** \page page_module_pulse_tunnel PipeWire Module: Pulse Tunnel
@ -753,7 +754,7 @@ error_unlock:
pa_threaded_mainloop_unlock(impl->pa_mainloop); pa_threaded_mainloop_unlock(impl->pa_mainloop);
error: error:
pw_log_error("failed to connect: %s", pa_strerror(res)); pw_log_error("failed to connect: %s", pa_strerror(res));
return -res; return err_to_res(res);
} }