diff options
| -rw-r--r-- | src/pulsecore/pdispatch.c | 92 |
1 files changed, 83 insertions, 9 deletions
diff --git a/src/pulsecore/pdispatch.c b/src/pulsecore/pdispatch.c index 00df0f79..a5b33d62 100644 --- a/src/pulsecore/pdispatch.c +++ b/src/pulsecore/pdispatch.c @@ -40,34 +40,35 @@ #include "pdispatch.h" -/*#define DEBUG_OPCODES */ +/* #define DEBUG_OPCODES */ #ifdef DEBUG_OPCODES static const char *command_names[PA_COMMAND_MAX] = { + /* Generic commands */ [PA_COMMAND_ERROR] = "ERROR", [PA_COMMAND_TIMEOUT] = "TIMEOUT", [PA_COMMAND_REPLY] = "REPLY", + + /* CLIENT->SERVER */ [PA_COMMAND_CREATE_PLAYBACK_STREAM] = "CREATE_PLAYBACK_STREAM", [PA_COMMAND_DELETE_PLAYBACK_STREAM] = "DELETE_PLAYBACK_STREAM", [PA_COMMAND_CREATE_RECORD_STREAM] = "CREATE_RECORD_STREAM", [PA_COMMAND_DELETE_RECORD_STREAM] = "DELETE_RECORD_STREAM", [PA_COMMAND_AUTH] = "AUTH", - [PA_COMMAND_REQUEST] = "REQUEST", [PA_COMMAND_EXIT] = "EXIT", [PA_COMMAND_SET_CLIENT_NAME] = "SET_CLIENT_NAME", [PA_COMMAND_LOOKUP_SINK] = "LOOKUP_SINK", [PA_COMMAND_LOOKUP_SOURCE] = "LOOKUP_SOURCE", [PA_COMMAND_DRAIN_PLAYBACK_STREAM] = "DRAIN_PLAYBACK_STREAM", - [PA_COMMAND_PLAYBACK_STREAM_KILLED] = "PLAYBACK_STREAM_KILLED", - [PA_COMMAND_RECORD_STREAM_KILLED] = "RECORD_STREAM_KILLED", [PA_COMMAND_STAT] = "STAT", - [PA_COMMAND_GET_PLAYBACK_LATENCY] = "PLAYBACK_LATENCY", + [PA_COMMAND_GET_PLAYBACK_LATENCY] = "GET_PLAYBACK_LATENCY", [PA_COMMAND_CREATE_UPLOAD_STREAM] = "CREATE_UPLOAD_STREAM", [PA_COMMAND_DELETE_UPLOAD_STREAM] = "DELETE_UPLOAD_STREAM", [PA_COMMAND_FINISH_UPLOAD_STREAM] = "FINISH_UPLOAD_STREAM", [PA_COMMAND_PLAY_SAMPLE] = "PLAY_SAMPLE", [PA_COMMAND_REMOVE_SAMPLE] = "REMOVE_SAMPLE", + [PA_COMMAND_GET_SERVER_INFO] = "GET_SERVER_INFO", [PA_COMMAND_GET_SINK_INFO] = "GET_SINK_INFO", [PA_COMMAND_GET_SINK_INFO_LIST] = "GET_SINK_INFO_LIST", @@ -84,15 +85,87 @@ static const char *command_names[PA_COMMAND_MAX] = { [PA_COMMAND_GET_SOURCE_OUTPUT_INFO] = "GET_SOURCE_OUTPUT_INFO", [PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST] = "GET_SOURCE_OUTPUT_INFO_LIST", [PA_COMMAND_SUBSCRIBE] = "SUBSCRIBE", - [PA_COMMAND_SUBSCRIBE_EVENT] = "SUBSCRIBE_EVENT", + [PA_COMMAND_SET_SINK_VOLUME] = "SET_SINK_VOLUME", [PA_COMMAND_SET_SINK_INPUT_VOLUME] = "SET_SINK_INPUT_VOLUME", [PA_COMMAND_SET_SOURCE_VOLUME] = "SET_SOURCE_VOLME", + + [PA_COMMAND_SET_SINK_MUTE] = "SET_SINK_MUTE", + [PA_COMMAND_SET_SOURCE_MUTE] = "SET_SOURCE_MUTE", + [PA_COMMAND_TRIGGER_PLAYBACK_STREAM] = "TRIGGER_PLAYBACK_STREAM", [PA_COMMAND_FLUSH_PLAYBACK_STREAM] = "FLUSH_PLAYBACK_STREAM", [PA_COMMAND_CORK_PLAYBACK_STREAM] = "CORK_PLAYBACK_STREAM", + + [PA_COMMAND_SET_DEFAULT_SINK] = "SET_DEFAULT_SINK", + [PA_COMMAND_SET_DEFAULT_SOURCE] = "SET_DEFAULT_SOURCE", + + [PA_COMMAND_SET_PLAYBACK_STREAM_NAME] = "SET_PLAYBACK_STREAM_NAME", + [PA_COMMAND_SET_RECORD_STREAM_NAME] = "SET_RECORD_STREAM_NAME", + + [PA_COMMAND_KILL_CLIENT] = "KILL_CLIENT", + [PA_COMMAND_KILL_SINK_INPUT] = "KILL_SINK_INPUT", + [PA_COMMAND_KILL_SOURCE_OUTPUT] = "SOURCE_OUTPUT", + + [PA_COMMAND_LOAD_MODULE] = "LOAD_MODULE", + [PA_COMMAND_UNLOAD_MODULE] = "UNLOAD_MODULE", + + [PA_COMMAND_ADD_AUTOLOAD] = "ADD_AUTOLOAD", + [PA_COMMAND_REMOVE_AUTOLOAD] = "REMOVE_AUTOLOAD", [PA_COMMAND_GET_AUTOLOAD_INFO] = "GET_AUTOLOAD_INFO", [PA_COMMAND_GET_AUTOLOAD_INFO_LIST] = "GET_AUTOLOAD_INFO_LIST", + + [PA_COMMAND_GET_RECORD_LATENCY] = "GET_RECORD_LATENCY", + [PA_COMMAND_CORK_RECORD_STREAM] = "CORK_RECORD_STREAM", + [PA_COMMAND_FLUSH_RECORD_STREAM] = "FLUSH_RECORD_STREAM", + [PA_COMMAND_PREBUF_PLAYBACK_STREAM] = "PREBUF_PLAYBACK_STREAM", + + /* SERVER->CLIENT */ + [PA_COMMAND_REQUEST] = "REQUEST", + [PA_COMMAND_OVERFLOW] = "OVERFLOW", + [PA_COMMAND_UNDERFLOW] = "UNDERFLOW", + [PA_COMMAND_PLAYBACK_STREAM_KILLED] = "PLAYBACK_STREAM_KILLED", + [PA_COMMAND_RECORD_STREAM_KILLED] = "RECORD_STREAM_KILLED", + [PA_COMMAND_SUBSCRIBE_EVENT] = "SUBSCRIBE_EVENT", + + /* A few more client->server commands */ + + /* Supported since protocol v10 (0.9.5) */ + [PA_COMMAND_MOVE_SINK_INPUT] = "MOVE_SINK_INPUT", + [PA_COMMAND_MOVE_SOURCE_OUTPUT] = "MOVE_SOURCE_OUTPUT", + + /* Supported since protocol v11 (0.9.7) */ + [PA_COMMAND_SET_SINK_INPUT_MUTE] = "SET_SINK_INPUT_MUTE", + + [PA_COMMAND_SUSPEND_SINK] = "SUSPEND_SINK", + [PA_COMMAND_SUSPEND_SOURCE] = "SUSPEND_SOURCE", + + /* Supported since protocol v12 (0.9.8) */ + [PA_COMMAND_SET_PLAYBACK_STREAM_BUFFER_ATTR] = "SET_PLAYBACK_STREAM_BUFFER_ATTR", + [PA_COMMAND_SET_RECORD_STREAM_BUFFER_ATTR] = "SET_RECORD_STREAM_BUFFER_ATTR", + + [PA_COMMAND_UPDATE_PLAYBACK_STREAM_SAMPLE_RATE] = "UPDATE_PLAYBACK_STREAM_SAMPLE_RATE", + [PA_COMMAND_UPDATE_RECORD_STREAM_SAMPLE_RATE] = "UPDATE_RECORD_STREAM_SAMPLE_RATE", + + /* SERVER->CLIENT */ + [PA_COMMAND_PLAYBACK_STREAM_SUSPENDED] = "PLAYBACK_STREAM_SUSPENDED", + [PA_COMMAND_RECORD_STREAM_SUSPENDED] = "RECORD_STREAM_SUSPENDED", + [PA_COMMAND_PLAYBACK_STREAM_MOVED] = "PLAYBACK_STREAM_MOVED", + [PA_COMMAND_RECORD_STREAM_MOVED] = "RECORD_STREAM_MOVED", + + /* Supported since protocol v13 (0.9.11) */ + [PA_COMMAND_UPDATE_RECORD_STREAM_PROPLIST] = "UPDATE_RECORD_STREAM_PROPLIST", + [PA_COMMAND_UPDATE_PLAYBACK_STREAM_PROPLIST] = "UPDATE_RECORD_STREAM_PROPLIST", + [PA_COMMAND_UPDATE_CLIENT_PROPLIST] = "UPDATE_CLIENT_PROPLIST", + [PA_COMMAND_REMOVE_RECORD_STREAM_PROPLIST] = "REMOVE_RECORD_STREAM_PROPLIST", + [PA_COMMAND_REMOVE_PLAYBACK_STREAM_PROPLIST] = "REMOVE_PLAYBACK_STREAM_PROPLIST", + [PA_COMMAND_REMOVE_CLIENT_PROPLIST] = "REMOVE_CLIENT_PROPLIST", + + /* SERVER->CLIENT */ + [PA_COMMAND_STARTED] = "STARTED", + + /* Supported since protocol v14 (0.9.12) */ + [PA_COMMAND_EXTENSION] = "EXTENSION" }; #endif @@ -213,11 +286,12 @@ int pa_pdispatch_run(pa_pdispatch *pd, pa_packet*packet, const pa_creds *creds, #ifdef DEBUG_OPCODES { char t[256]; - char const *p; - if (!(p = command_names[command])) + char const *p = NULL; + + if (command >= PA_COMMAND_MAX || !(p = command_names[command])) pa_snprintf((char*) (p = t), sizeof(t), "%u", command); - pa_log("Recieved opcode <%s>", p); + pa_log("[%p] Recieved opcode <%s>", pd, p); } #endif |