diff options
| author | Stephane Letz <letz@grame.fr> | 2011-07-30 10:51:18 +0200 |
|---|---|---|
| committer | Stephane Letz <letz@grame.fr> | 2011-07-30 10:51:18 +0200 |
| commit | 80d316ece46717f3634c5466e499b2d11fceb209 (patch) | |
| tree | 8b7b0913274e3cd06202f186b9624b9e9e2092d4 /common/JackRequest.h | |
| parent | 4e979b964966b6596eb725916f9ff16932e85880 (diff) | |
| parent | 7918f1c12abdd8d9328b829a87f9ae3a414344b5 (diff) | |
| download | jack2-80d316ece46717f3634c5466e499b2d11fceb209.tar.gz | |
Merge branch 'master' into js-dbus
Diffstat (limited to 'common/JackRequest.h')
| -rw-r--r-- | common/JackRequest.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/common/JackRequest.h b/common/JackRequest.h index f5e86543..07ec219c 100644 --- a/common/JackRequest.h +++ b/common/JackRequest.h @@ -149,11 +149,12 @@ struct JackClientCheckRequest : public JackRequest int fProtocol; int fOptions; int fUUID; + int fOpen; JackClientCheckRequest() {} - JackClientCheckRequest(const char* name, int protocol, int options, int uuid) - : JackRequest(JackRequest::kClientCheck), fProtocol(protocol), fOptions(options), fUUID(uuid) + JackClientCheckRequest(const char* name, int protocol, int options, int uuid, int open = false) + : JackRequest(JackRequest::kClientCheck), fProtocol(protocol), fOptions(options), fUUID(uuid), fOpen(open) { snprintf(fName, sizeof(fName), "%s", name); } @@ -163,7 +164,8 @@ struct JackClientCheckRequest : public JackRequest CheckRes(trans->Read(&fName, sizeof(fName))); CheckRes(trans->Read(&fProtocol, sizeof(int))); CheckRes(trans->Read(&fOptions, sizeof(int))); - return trans->Read(&fUUID, sizeof(int)); + CheckRes(trans->Read(&fUUID, sizeof(int))); + return trans->Read(&fOpen, sizeof(int)); } int Write(JackChannelTransaction* trans) @@ -172,7 +174,8 @@ struct JackClientCheckRequest : public JackRequest CheckRes(trans->Write(&fName, sizeof(fName))); CheckRes(trans->Write(&fProtocol, sizeof(int))); CheckRes(trans->Write(&fOptions, sizeof(int))); - return trans->Write(&fUUID, sizeof(int)); + CheckRes(trans->Write(&fUUID, sizeof(int))); + return trans->Write(&fOpen, sizeof(int)); } }; |