owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP remote client/server tests

Browse Source
This commit is contained in:
emeric
2014-05-07 13:31:47 +02:00
parent 57944e5415
commit 8f4d3e5e23
20 changed files with 3381 additions and 3081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+5
View File
@@ -62,6 +62,11 @@ AC_CHECK_LIB( [boost_iostreams],
,
[AC_MSG_ERROR([libboost_iostreams not found!])])
AC_CHECK_LIB( [protobuf],
[main],
,
[AC_MSG_ERROR([libprotobuf not found!])])
# TODO -> PARAMETRIZE THIS
AC_CHECK_LIB([wthttp],
[main],
remote/messages/Header.hpp
+47
View File
@@ -8,8 +8,55 @@ namespace Remote
class Header
{
public:
static const std::size_t size = 8;
Header() : _size(0) {}
void setSize(std::size_t size) { _size = size; }
std::size_t getSize(void) const {return _size;}
static Header from_buffer(const std::array<unsigned char, size>& buffer, bool& error)
{
Header res;
if (decode32(&buffer[0]) != _magic)
error = true;
else
{
res._size = decode32(&buffer[4]);
error = false;
}
return res;
}
void to_buffer(std::array<unsigned char, size>& buffer)
{
encode32(_magic, &buffer[0]);
encode32(_size, &buffer[4]);
}
private:
static uint32_t decode32(const unsigned char* data)
{
return (static_cast<uint32_t>(data[0]) << 24)
+ (static_cast<uint32_t>(data[1]) << 16)
+ (static_cast<uint32_t>(data[2]) << 8)
+ (static_cast<uint32_t>(data[3]));
}
static void encode32(uint32_t value, unsigned char* data)
{
data[0] = (value >> 24) & 0xFF;
data[1] = (value >> 16) & 0xFF;
data[2] = (value >> 8) & 0xFF;
data[3] = (value) & 0xFF;
}
static const uint32_t _magic = 0xbeef;
uint32_t _size;
};
remote/messages/auth.pb.cc
+16 -12
View File
@@ -16,6 +16,8 @@
#include <google/protobuf/wire_format.h>
// @@protoc_insertion_point(includes)
namespace Remote {
namespace {
const ::google::protobuf::Descriptor* AuthRequest_descriptor_ = NULL;
@@ -98,12 +100,12 @@ void protobuf_AddDesc_auth_2eproto() {
already_here = true;
GOOGLE_PROTOBUF_VERIFY_VERSION;
::protobuf_AddDesc_common_2eproto();
::Remote::protobuf_AddDesc_common_2eproto();
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
"\n\nauth.proto\032\014common.proto\"7\n\013AuthReques"
"t\022\021\n\tuser_name\030\001 \002(\t\022\025\n\ruser_password\030\002 "
"\002(\t\"%\n\014AuthResponse\022\025\n\005error\030\001 \002(\0132\006.Err"
"or", 122);
"\n\nauth.proto\022\006Remote\032\014common.proto\"7\n\013Au"
"thRequest\022\021\n\tuser_name\030\001 \002(\t\022\025\n\ruser_pas"
"sword\030\002 \002(\t\",\n\014AuthResponse\022\034\n\005error\030\001 \002"
"(\0132\r.Remote.Error", 137);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"auth.proto", &protobuf_RegisterTypes);
AuthRequest::default_instance_ = new AuthRequest();
@@ -415,7 +417,7 @@ AuthResponse::AuthResponse()
}
void AuthResponse::InitAsDefaultInstance() {
error_ = const_cast< ::Error*>(&::Error::default_instance());
error_ = const_cast< ::Remote::Error*>(&::Remote::Error::default_instance());
}
AuthResponse::AuthResponse(const AuthResponse& from)
@@ -464,7 +466,7 @@ AuthResponse* AuthResponse::New() const {
void AuthResponse::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
if (has_error()) {
if (error_ != NULL) error_->::Error::Clear();
if (error_ != NULL) error_->::Remote::Error::Clear();
}
}
::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -477,7 +479,7 @@ bool AuthResponse::MergePartialFromCodedStream(
::google::protobuf::uint32 tag;
while ((tag = input->ReadTag()) != 0) {
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// required .Error error = 1;
// required .Remote.Error error = 1;
case 1: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -508,7 +510,7 @@ bool AuthResponse::MergePartialFromCodedStream(
void AuthResponse::SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const {
// required .Error error = 1;
// required .Remote.Error error = 1;
if (has_error()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
1, this->error(), output);
@@ -522,7 +524,7 @@ void AuthResponse::SerializeWithCachedSizes(
::google::protobuf::uint8* AuthResponse::SerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const {
// required .Error error = 1;
// required .Remote.Error error = 1;
if (has_error()) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
@@ -540,7 +542,7 @@ int AuthResponse::ByteSize() const {
int total_size = 0;
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
// required .Error error = 1;
// required .Remote.Error error = 1;
if (has_error()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -575,7 +577,7 @@ void AuthResponse::MergeFrom(const AuthResponse& from) {
GOOGLE_CHECK_NE(&from, this);
if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
if (from.has_error()) {
mutable_error()->::Error::MergeFrom(from.error());
mutable_error()->::Remote::Error::MergeFrom(from.error());
}
}
mutable_unknown_fields()->MergeFrom(from.unknown_fields());
@@ -622,4 +624,6 @@ void AuthResponse::Swap(AuthResponse* other) {
// @@protoc_insertion_point(namespace_scope)
} // namespace Remote
// @@protoc_insertion_point(global_scope)
remote/messages/auth.pb.h
+20 -16
View File
@@ -27,6 +27,8 @@
#include "common.pb.h"
// @@protoc_insertion_point(includes)
namespace Remote {
// Internal implementation detail -- do not call these.
void protobuf_AddDesc_auth_2eproto();
void protobuf_AssignDesc_auth_2eproto();
@@ -115,7 +117,7 @@ class AuthRequest : public ::google::protobuf::Message {
inline ::std::string* release_user_password();
inline void set_allocated_user_password(::std::string* user_password);
// @@protoc_insertion_point(class_scope:AuthRequest)
// @@protoc_insertion_point(class_scope:Remote.AuthRequest)
private:
inline void set_has_user_name();
inline void clear_has_user_name();
@@ -193,23 +195,23 @@ class AuthResponse : public ::google::protobuf::Message {
// accessors -------------------------------------------------------
// required .Error error = 1;
// required .Remote.Error error = 1;
inline bool has_error() const;
inline void clear_error();
static const int kErrorFieldNumber = 1;
inline const ::Error& error() const;
inline ::Error* mutable_error();
inline ::Error* release_error();
inline void set_allocated_error(::Error* error);
inline const ::Remote::Error& error() const;
inline ::Remote::Error* mutable_error();
inline ::Remote::Error* release_error();
inline void set_allocated_error(::Remote::Error* error);
// @@protoc_insertion_point(class_scope:AuthResponse)
// @@protoc_insertion_point(class_scope:Remote.AuthResponse)
private:
inline void set_has_error();
inline void clear_has_error();
::google::protobuf::UnknownFieldSet _unknown_fields_;
::Error* error_;
::Remote::Error* error_;
mutable int _cached_size_;
::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
@@ -372,7 +374,7 @@ inline void AuthRequest::set_allocated_user_password(::std::string* user_passwor
// AuthResponse
// required .Error error = 1;
// required .Remote.Error error = 1;
inline bool AuthResponse::has_error() const {
return (_has_bits_[0] & 0x00000001u) != 0;
}
@@ -383,24 +385,24 @@ inline void AuthResponse::clear_has_error() {
_has_bits_[0] &= ~0x00000001u;
}
inline void AuthResponse::clear_error() {
if (error_ != NULL) error_->::Error::Clear();
if (error_ != NULL) error_->::Remote::Error::Clear();
clear_has_error();
}
inline const ::Error& AuthResponse::error() const {
inline const ::Remote::Error& AuthResponse::error() const {
return error_ != NULL ? *error_ : *default_instance_->error_;
}
inline ::Error* AuthResponse::mutable_error() {
inline ::Remote::Error* AuthResponse::mutable_error() {
set_has_error();
if (error_ == NULL) error_ = new ::Error;
if (error_ == NULL) error_ = new ::Remote::Error;
return error_;
}
inline ::Error* AuthResponse::release_error() {
inline ::Remote::Error* AuthResponse::release_error() {
clear_has_error();
::Error* temp = error_;
::Remote::Error* temp = error_;
error_ = NULL;
return temp;
}
inline void AuthResponse::set_allocated_error(::Error* error) {
inline void AuthResponse::set_allocated_error(::Remote::Error* error) {
delete error_;
error_ = error;
if (error) {
@@ -413,6 +415,8 @@ inline void AuthResponse::set_allocated_error(::Error* error) {
// @@protoc_insertion_point(namespace_scope)
} // namespace Remote
#ifndef SWIG
namespace google {
namespace protobuf {
remote/messages/collection.pb.cc
+1358 -1344
View File
File diff suppressed because it is too large Load Diff
remote/messages/collection.pb.h
+1188 -1174
View File
File diff suppressed because it is too large Load Diff
remote/messages/common.pb.cc
+6 -2
View File
@@ -16,6 +16,8 @@
#include <google/protobuf/wire_format.h>
// @@protoc_insertion_point(includes)
namespace Remote {
namespace {
const ::google::protobuf::Descriptor* Error_descriptor_ = NULL;
@@ -77,8 +79,8 @@ void protobuf_AddDesc_common_2eproto() {
GOOGLE_PROTOBUF_VERIFY_VERSION;
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
"\n\014common.proto\"\'\n\005Error\022\r\n\005error\030\001 \002(\010\022\017"
"\n\007message\030\002 \001(\t", 55);
"\n\014common.proto\022\006Remote\"\'\n\005Error\022\r\n\005error"
"\030\001 \002(\010\022\017\n\007message\030\002 \001(\t", 63);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"common.proto", &protobuf_RegisterTypes);
Error::default_instance_ = new Error();
@@ -359,4 +361,6 @@ void Error::Swap(Error* other) {
// @@protoc_insertion_point(namespace_scope)
} // namespace Remote
// @@protoc_insertion_point(global_scope)
remote/messages/common.pb.h
+5 -1
View File
@@ -26,6 +26,8 @@
#include <google/protobuf/unknown_field_set.h>
// @@protoc_insertion_point(includes)
namespace Remote {
// Internal implementation detail -- do not call these.
void protobuf_AddDesc_common_2eproto();
void protobuf_AssignDesc_common_2eproto();
@@ -108,7 +110,7 @@ class Error : public ::google::protobuf::Message {
inline ::std::string* release_message();
inline void set_allocated_message(::std::string* message);
// @@protoc_insertion_point(class_scope:Error)
// @@protoc_insertion_point(class_scope:Remote.Error)
private:
inline void set_has_error();
inline void clear_has_error();
@@ -232,6 +234,8 @@ inline void Error::set_allocated_message(::std::string* message) {
// @@protoc_insertion_point(namespace_scope)
} // namespace Remote
#ifndef SWIG
namespace google {
namespace protobuf {
remote/messages/media.pb.cc
+79 -74
View File
@@ -16,6 +16,8 @@
#include <google/protobuf/wire_format.h>
// @@protoc_insertion_point(includes)
namespace Remote {
namespace {
const ::google::protobuf::Descriptor* MediaRequest_descriptor_ = NULL;
@@ -203,28 +205,29 @@ void protobuf_AddDesc_media_2eproto() {
already_here = true;
GOOGLE_PROTOBUF_VERIFY_VERSION;
::protobuf_AddDesc_common_2eproto();
::Remote::protobuf_AddDesc_common_2eproto();
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
"\n\013media.proto\032\014common.proto\"\376\003\n\014MediaReq"
"uest\022(\n\014request_type\030\001 \002(\0162\022.MediaReques"
"t.Type\022&\n\007prepare\030\002 \001(\0132\025.MediaRequest.P"
"repare\022\'\n\010get_part\030\003 \001(\0132\025.MediaRequest."
"GetPart\022*\n\tterminate\030\004 \001(\0132\027.MediaReques"
"t.Terminate\032\311\001\n\007Prepare\022\n\n\002id\030\001 \002(\003\022\023\n\013o"
"ffset_secs\030\002 \002(\r\022\036\n\ncodec_type\030\003 \001(\0162\n.C"
"odecType\022\025\n\raudio_bitrate\030\004 \001(\r\022\025\n\rvideo"
"_bitrate\030\005 \001(\r\022\030\n\020audio_stream_idx\030\006 \001(\r"
"\022\030\n\020video_stream_idx\030\007 \001(\r\022\033\n\023subtitle_s"
"tream_idx\030\010 \001(\r\032&\n\007GetPart\022\033\n\023requested_"
"data_size\030\001 \002(\r\032\013\n\tTerminate\"F\n\004Type\022\024\n\020"
"TypeMediaPrepare\020\001\022\020\n\014TypeMediaGet\020\002\022\026\n\022"
"TypeMediaTerminate\020\003\"\305\001\n\rMediaResponse\022\025"
"\n\005error\030\001 \002(\0132\006.Error\022*\n\rresponse_type\030\002"
" \002(\0162\023.MediaResponse.Type\022&\n\004part\030\003 \001(\0132"
"\030.MediaResponse.MediaPart\032.\n\tMediaPart\022\023"
"\n\013byte_offset\030\001 \002(\004\022\014\n\004data\030\002 \003(\014\"\031\n\004Typ"
"e\022\021\n\rTypeMediaPart\020\001*\035\n\tCodecType\022\020\n\014Cod"
"ecTypeOGG\020\001", 771);
"\n\013media.proto\022\006Remote\032\014common.proto\"\241\004\n\014"
"MediaRequest\022/\n\014request_type\030\001 \002(\0162\031.Rem"
"ote.MediaRequest.Type\022-\n\007prepare\030\002 \001(\0132\034"
".Remote.MediaRequest.Prepare\022.\n\010get_part"
"\030\003 \001(\0132\034.Remote.MediaRequest.GetPart\0221\n\t"
"terminate\030\004 \001(\0132\036.Remote.MediaRequest.Te"
"rminate\032\320\001\n\007Prepare\022\n\n\002id\030\001 \002(\003\022\023\n\013offse"
"t_secs\030\002 \002(\r\022%\n\ncodec_type\030\003 \001(\0162\021.Remot"
"e.CodecType\022\025\n\raudio_bitrate\030\004 \001(\r\022\025\n\rvi"
"deo_bitrate\030\005 \001(\r\022\030\n\020audio_stream_idx\030\006 "
"\001(\r\022\030\n\020video_stream_idx\030\007 \001(\r\022\033\n\023subtitl"
"e_stream_idx\030\010 \001(\r\032&\n\007GetPart\022\033\n\023request"
"ed_data_size\030\001 \002(\r\032\013\n\tTerminate\"F\n\004Type\022"
"\024\n\020TypeMediaPrepare\020\001\022\020\n\014TypeMediaGet\020\002\022"
"\026\n\022TypeMediaTerminate\020\003\"\332\001\n\rMediaRespons"
"e\022\034\n\005error\030\001 \002(\0132\r.Remote.Error\0221\n\rrespo"
"nse_type\030\002 \002(\0162\032.Remote.MediaResponse.Ty"
"pe\022-\n\004part\030\003 \001(\0132\037.Remote.MediaResponse."
"MediaPart\032.\n\tMediaPart\022\023\n\013byte_offset\030\001 "
"\002(\004\022\014\n\004data\030\002 \003(\014\"\031\n\004Type\022\021\n\rTypeMediaPa"
"rt\020\001*\035\n\tCodecType\022\020\n\014CodecTypeOGG\020\001", 835);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"media.proto", &protobuf_RegisterTypes);
MediaRequest::default_instance_ = new MediaRequest();
@@ -407,7 +410,7 @@ bool MediaRequest_Prepare::MergePartialFromCodedStream(
break;
}
// optional .CodecType codec_type = 3;
// optional .Remote.CodecType codec_type = 3;
case 3: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -416,8 +419,8 @@ bool MediaRequest_Prepare::MergePartialFromCodedStream(
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
input, &value)));
if (::CodecType_IsValid(value)) {
set_codec_type(static_cast< ::CodecType >(value));
if (::Remote::CodecType_IsValid(value)) {
set_codec_type(static_cast< ::Remote::CodecType >(value));
} else {
mutable_unknown_fields()->AddVarint(3, value);
}
@@ -536,7 +539,7 @@ void MediaRequest_Prepare::SerializeWithCachedSizes(
::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->offset_secs(), output);
}
// optional .CodecType codec_type = 3;
// optional .Remote.CodecType codec_type = 3;
if (has_codec_type()) {
::google::protobuf::internal::WireFormatLite::WriteEnum(
3, this->codec_type(), output);
@@ -585,7 +588,7 @@ void MediaRequest_Prepare::SerializeWithCachedSizes(
target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->offset_secs(), target);
}
// optional .CodecType codec_type = 3;
// optional .Remote.CodecType codec_type = 3;
if (has_codec_type()) {
target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
3, this->codec_type(), target);
@@ -641,7 +644,7 @@ int MediaRequest_Prepare::ByteSize() const {
this->offset_secs());
}
// optional .CodecType codec_type = 3;
// optional .Remote.CodecType codec_type = 3;
if (has_codec_type()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::EnumSize(this->codec_type());
@@ -1160,9 +1163,9 @@ MediaRequest::MediaRequest()
}
void MediaRequest::InitAsDefaultInstance() {
prepare_ = const_cast< ::MediaRequest_Prepare*>(&::MediaRequest_Prepare::default_instance());
get_part_ = const_cast< ::MediaRequest_GetPart*>(&::MediaRequest_GetPart::default_instance());
terminate_ = const_cast< ::MediaRequest_Terminate*>(&::MediaRequest_Terminate::default_instance());
prepare_ = const_cast< ::Remote::MediaRequest_Prepare*>(&::Remote::MediaRequest_Prepare::default_instance());
get_part_ = const_cast< ::Remote::MediaRequest_GetPart*>(&::Remote::MediaRequest_GetPart::default_instance());
terminate_ = const_cast< ::Remote::MediaRequest_Terminate*>(&::Remote::MediaRequest_Terminate::default_instance());
}
MediaRequest::MediaRequest(const MediaRequest& from)
@@ -1217,13 +1220,13 @@ void MediaRequest::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
request_type_ = 1;
if (has_prepare()) {
if (prepare_ != NULL) prepare_->::MediaRequest_Prepare::Clear();
if (prepare_ != NULL) prepare_->::Remote::MediaRequest_Prepare::Clear();
}
if (has_get_part()) {
if (get_part_ != NULL) get_part_->::MediaRequest_GetPart::Clear();
if (get_part_ != NULL) get_part_->::Remote::MediaRequest_GetPart::Clear();
}
if (has_terminate()) {
if (terminate_ != NULL) terminate_->::MediaRequest_Terminate::Clear();
if (terminate_ != NULL) terminate_->::Remote::MediaRequest_Terminate::Clear();
}
}
::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -1236,7 +1239,7 @@ bool MediaRequest::MergePartialFromCodedStream(
::google::protobuf::uint32 tag;
while ((tag = input->ReadTag()) != 0) {
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// required .MediaRequest.Type request_type = 1;
// required .Remote.MediaRequest.Type request_type = 1;
case 1: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -1244,8 +1247,8 @@ bool MediaRequest::MergePartialFromCodedStream(
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
input, &value)));
if (::MediaRequest_Type_IsValid(value)) {
set_request_type(static_cast< ::MediaRequest_Type >(value));
if (::Remote::MediaRequest_Type_IsValid(value)) {
set_request_type(static_cast< ::Remote::MediaRequest_Type >(value));
} else {
mutable_unknown_fields()->AddVarint(1, value);
}
@@ -1256,7 +1259,7 @@ bool MediaRequest::MergePartialFromCodedStream(
break;
}
// optional .MediaRequest.Prepare prepare = 2;
// optional .Remote.MediaRequest.Prepare prepare = 2;
case 2: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -1270,7 +1273,7 @@ bool MediaRequest::MergePartialFromCodedStream(
break;
}
// optional .MediaRequest.GetPart get_part = 3;
// optional .Remote.MediaRequest.GetPart get_part = 3;
case 3: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -1284,7 +1287,7 @@ bool MediaRequest::MergePartialFromCodedStream(
break;
}
// optional .MediaRequest.Terminate terminate = 4;
// optional .Remote.MediaRequest.Terminate terminate = 4;
case 4: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -1316,25 +1319,25 @@ bool MediaRequest::MergePartialFromCodedStream(
void MediaRequest::SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const {
// required .MediaRequest.Type request_type = 1;
// required .Remote.MediaRequest.Type request_type = 1;
if (has_request_type()) {
::google::protobuf::internal::WireFormatLite::WriteEnum(
1, this->request_type(), output);
}
// optional .MediaRequest.Prepare prepare = 2;
// optional .Remote.MediaRequest.Prepare prepare = 2;
if (has_prepare()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
2, this->prepare(), output);
}
// optional .MediaRequest.GetPart get_part = 3;
// optional .Remote.MediaRequest.GetPart get_part = 3;
if (has_get_part()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
3, this->get_part(), output);
}
// optional .MediaRequest.Terminate terminate = 4;
// optional .Remote.MediaRequest.Terminate terminate = 4;
if (has_terminate()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
4, this->terminate(), output);
@@ -1348,27 +1351,27 @@ void MediaRequest::SerializeWithCachedSizes(
::google::protobuf::uint8* MediaRequest::SerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const {
// required .MediaRequest.Type request_type = 1;
// required .Remote.MediaRequest.Type request_type = 1;
if (has_request_type()) {
target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
1, this->request_type(), target);
}
// optional .MediaRequest.Prepare prepare = 2;
// optional .Remote.MediaRequest.Prepare prepare = 2;
if (has_prepare()) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
2, this->prepare(), target);
}
// optional .MediaRequest.GetPart get_part = 3;
// optional .Remote.MediaRequest.GetPart get_part = 3;
if (has_get_part()) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
3, this->get_part(), target);
}
// optional .MediaRequest.Terminate terminate = 4;
// optional .Remote.MediaRequest.Terminate terminate = 4;
if (has_terminate()) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
@@ -1386,27 +1389,27 @@ int MediaRequest::ByteSize() const {
int total_size = 0;
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
// required .MediaRequest.Type request_type = 1;
// required .Remote.MediaRequest.Type request_type = 1;
if (has_request_type()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::EnumSize(this->request_type());
}
// optional .MediaRequest.Prepare prepare = 2;
// optional .Remote.MediaRequest.Prepare prepare = 2;
if (has_prepare()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
this->prepare());
}
// optional .MediaRequest.GetPart get_part = 3;
// optional .Remote.MediaRequest.GetPart get_part = 3;
if (has_get_part()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
this->get_part());
}
// optional .MediaRequest.Terminate terminate = 4;
// optional .Remote.MediaRequest.Terminate terminate = 4;
if (has_terminate()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -1444,13 +1447,13 @@ void MediaRequest::MergeFrom(const MediaRequest& from) {
set_request_type(from.request_type());
}
if (from.has_prepare()) {
mutable_prepare()->::MediaRequest_Prepare::MergeFrom(from.prepare());
mutable_prepare()->::Remote::MediaRequest_Prepare::MergeFrom(from.prepare());
}
if (from.has_get_part()) {
mutable_get_part()->::MediaRequest_GetPart::MergeFrom(from.get_part());
mutable_get_part()->::Remote::MediaRequest_GetPart::MergeFrom(from.get_part());
}
if (from.has_terminate()) {
mutable_terminate()->::MediaRequest_Terminate::MergeFrom(from.terminate());
mutable_terminate()->::Remote::MediaRequest_Terminate::MergeFrom(from.terminate());
}
}
mutable_unknown_fields()->MergeFrom(from.unknown_fields());
@@ -1781,8 +1784,8 @@ MediaResponse::MediaResponse()
}
void MediaResponse::InitAsDefaultInstance() {
error_ = const_cast< ::Error*>(&::Error::default_instance());
part_ = const_cast< ::MediaResponse_MediaPart*>(&::MediaResponse_MediaPart::default_instance());
error_ = const_cast< ::Remote::Error*>(&::Remote::Error::default_instance());
part_ = const_cast< ::Remote::MediaResponse_MediaPart*>(&::Remote::MediaResponse_MediaPart::default_instance());
}
MediaResponse::MediaResponse(const MediaResponse& from)
@@ -1834,11 +1837,11 @@ MediaResponse* MediaResponse::New() const {
void MediaResponse::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
if (has_error()) {
if (error_ != NULL) error_->::Error::Clear();
if (error_ != NULL) error_->::Remote::Error::Clear();
}
response_type_ = 1;
if (has_part()) {
if (part_ != NULL) part_->::MediaResponse_MediaPart::Clear();
if (part_ != NULL) part_->::Remote::MediaResponse_MediaPart::Clear();
}
}
::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -1851,7 +1854,7 @@ bool MediaResponse::MergePartialFromCodedStream(
::google::protobuf::uint32 tag;
while ((tag = input->ReadTag()) != 0) {
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// required .Error error = 1;
// required .Remote.Error error = 1;
case 1: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -1864,7 +1867,7 @@ bool MediaResponse::MergePartialFromCodedStream(
break;
}
// required .MediaResponse.Type response_type = 2;
// required .Remote.MediaResponse.Type response_type = 2;
case 2: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -1873,8 +1876,8 @@ bool MediaResponse::MergePartialFromCodedStream(
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
input, &value)));
if (::MediaResponse_Type_IsValid(value)) {
set_response_type(static_cast< ::MediaResponse_Type >(value));
if (::Remote::MediaResponse_Type_IsValid(value)) {
set_response_type(static_cast< ::Remote::MediaResponse_Type >(value));
} else {
mutable_unknown_fields()->AddVarint(2, value);
}
@@ -1885,7 +1888,7 @@ bool MediaResponse::MergePartialFromCodedStream(
break;
}
// optional .MediaResponse.MediaPart part = 3;
// optional .Remote.MediaResponse.MediaPart part = 3;
case 3: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -1917,19 +1920,19 @@ bool MediaResponse::MergePartialFromCodedStream(
void MediaResponse::SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const {
// required .Error error = 1;
// required .Remote.Error error = 1;
if (has_error()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
1, this->error(), output);
}
// required .MediaResponse.Type response_type = 2;
// required .Remote.MediaResponse.Type response_type = 2;
if (has_response_type()) {
::google::protobuf::internal::WireFormatLite::WriteEnum(
2, this->response_type(), output);
}
// optional .MediaResponse.MediaPart part = 3;
// optional .Remote.MediaResponse.MediaPart part = 3;
if (has_part()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
3, this->part(), output);
@@ -1943,20 +1946,20 @@ void MediaResponse::SerializeWithCachedSizes(
::google::protobuf::uint8* MediaResponse::SerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const {
// required .Error error = 1;
// required .Remote.Error error = 1;
if (has_error()) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
1, this->error(), target);
}
// required .MediaResponse.Type response_type = 2;
// required .Remote.MediaResponse.Type response_type = 2;
if (has_response_type()) {
target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
2, this->response_type(), target);
}
// optional .MediaResponse.MediaPart part = 3;
// optional .Remote.MediaResponse.MediaPart part = 3;
if (has_part()) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
@@ -1974,20 +1977,20 @@ int MediaResponse::ByteSize() const {
int total_size = 0;
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
// required .Error error = 1;
// required .Remote.Error error = 1;
if (has_error()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
this->error());
}
// required .MediaResponse.Type response_type = 2;
// required .Remote.MediaResponse.Type response_type = 2;
if (has_response_type()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::EnumSize(this->response_type());
}
// optional .MediaResponse.MediaPart part = 3;
// optional .Remote.MediaResponse.MediaPart part = 3;
if (has_part()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -2022,13 +2025,13 @@ void MediaResponse::MergeFrom(const MediaResponse& from) {
GOOGLE_CHECK_NE(&from, this);
if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
if (from.has_error()) {
mutable_error()->::Error::MergeFrom(from.error());
mutable_error()->::Remote::Error::MergeFrom(from.error());
}
if (from.has_response_type()) {
set_response_type(from.response_type());
}
if (from.has_part()) {
mutable_part()->::MediaResponse_MediaPart::MergeFrom(from.part());
mutable_part()->::Remote::MediaResponse_MediaPart::MergeFrom(from.part());
}
}
mutable_unknown_fields()->MergeFrom(from.unknown_fields());
@@ -2080,4 +2083,6 @@ void MediaResponse::Swap(MediaResponse* other) {
// @@protoc_insertion_point(namespace_scope)
} // namespace Remote
// @@protoc_insertion_point(global_scope)
remote/messages/media.pb.h
+110 -106
View File
@@ -28,6 +28,8 @@
#include "common.pb.h"
// @@protoc_insertion_point(includes)
namespace Remote {
// Internal implementation detail -- do not call these.
void protobuf_AddDesc_media_2eproto();
void protobuf_AssignDesc_media_2eproto();
@@ -166,12 +168,12 @@ class MediaRequest_Prepare : public ::google::protobuf::Message {
inline ::google::protobuf::uint32 offset_secs() const;
inline void set_offset_secs(::google::protobuf::uint32 value);
// optional .CodecType codec_type = 3;
// optional .Remote.CodecType codec_type = 3;
inline bool has_codec_type() const;
inline void clear_codec_type();
static const int kCodecTypeFieldNumber = 3;
inline ::CodecType codec_type() const;
inline void set_codec_type(::CodecType value);
inline ::Remote::CodecType codec_type() const;
inline void set_codec_type(::Remote::CodecType value);
// optional uint32 audio_bitrate = 4;
inline bool has_audio_bitrate() const;
@@ -208,7 +210,7 @@ class MediaRequest_Prepare : public ::google::protobuf::Message {
inline ::google::protobuf::uint32 subtitle_stream_idx() const;
inline void set_subtitle_stream_idx(::google::protobuf::uint32 value);
// @@protoc_insertion_point(class_scope:MediaRequest.Prepare)
// @@protoc_insertion_point(class_scope:Remote.MediaRequest.Prepare)
private:
inline void set_has_id();
inline void clear_has_id();
@@ -311,7 +313,7 @@ class MediaRequest_GetPart : public ::google::protobuf::Message {
inline ::google::protobuf::uint32 requested_data_size() const;
inline void set_requested_data_size(::google::protobuf::uint32 value);
// @@protoc_insertion_point(class_scope:MediaRequest.GetPart)
// @@protoc_insertion_point(class_scope:Remote.MediaRequest.GetPart)
private:
inline void set_has_requested_data_size();
inline void clear_has_requested_data_size();
@@ -386,7 +388,7 @@ class MediaRequest_Terminate : public ::google::protobuf::Message {
// accessors -------------------------------------------------------
// @@protoc_insertion_point(class_scope:MediaRequest.Terminate)
// @@protoc_insertion_point(class_scope:Remote.MediaRequest.Terminate)
private:
::google::protobuf::UnknownFieldSet _unknown_fields_;
@@ -487,41 +489,41 @@ class MediaRequest : public ::google::protobuf::Message {
// accessors -------------------------------------------------------
// required .MediaRequest.Type request_type = 1;
// required .Remote.MediaRequest.Type request_type = 1;
inline bool has_request_type() const;
inline void clear_request_type();
static const int kRequestTypeFieldNumber = 1;
inline ::MediaRequest_Type request_type() const;
inline void set_request_type(::MediaRequest_Type value);
inline ::Remote::MediaRequest_Type request_type() const;
inline void set_request_type(::Remote::MediaRequest_Type value);
// optional .MediaRequest.Prepare prepare = 2;
// optional .Remote.MediaRequest.Prepare prepare = 2;
inline bool has_prepare() const;
inline void clear_prepare();
static const int kPrepareFieldNumber = 2;
inline const ::MediaRequest_Prepare& prepare() const;
inline ::MediaRequest_Prepare* mutable_prepare();
inline ::MediaRequest_Prepare* release_prepare();
inline void set_allocated_prepare(::MediaRequest_Prepare* prepare);
inline const ::Remote::MediaRequest_Prepare& prepare() const;
inline ::Remote::MediaRequest_Prepare* mutable_prepare();
inline ::Remote::MediaRequest_Prepare* release_prepare();
inline void set_allocated_prepare(::Remote::MediaRequest_Prepare* prepare);
// optional .MediaRequest.GetPart get_part = 3;
// optional .Remote.MediaRequest.GetPart get_part = 3;
inline bool has_get_part() const;
inline void clear_get_part();
static const int kGetPartFieldNumber = 3;
inline const ::MediaRequest_GetPart& get_part() const;
inline ::MediaRequest_GetPart* mutable_get_part();
inline ::MediaRequest_GetPart* release_get_part();
inline void set_allocated_get_part(::MediaRequest_GetPart* get_part);
inline const ::Remote::MediaRequest_GetPart& get_part() const;
inline ::Remote::MediaRequest_GetPart* mutable_get_part();
inline ::Remote::MediaRequest_GetPart* release_get_part();
inline void set_allocated_get_part(::Remote::MediaRequest_GetPart* get_part);
// optional .MediaRequest.Terminate terminate = 4;
// optional .Remote.MediaRequest.Terminate terminate = 4;
inline bool has_terminate() const;
inline void clear_terminate();
static const int kTerminateFieldNumber = 4;
inline const ::MediaRequest_Terminate& terminate() const;
inline ::MediaRequest_Terminate* mutable_terminate();
inline ::MediaRequest_Terminate* release_terminate();
inline void set_allocated_terminate(::MediaRequest_Terminate* terminate);
inline const ::Remote::MediaRequest_Terminate& terminate() const;
inline ::Remote::MediaRequest_Terminate* mutable_terminate();
inline ::Remote::MediaRequest_Terminate* release_terminate();
inline void set_allocated_terminate(::Remote::MediaRequest_Terminate* terminate);
// @@protoc_insertion_point(class_scope:MediaRequest)
// @@protoc_insertion_point(class_scope:Remote.MediaRequest)
private:
inline void set_has_request_type();
inline void clear_has_request_type();
@@ -534,9 +536,9 @@ class MediaRequest : public ::google::protobuf::Message {
::google::protobuf::UnknownFieldSet _unknown_fields_;
::MediaRequest_Prepare* prepare_;
::MediaRequest_GetPart* get_part_;
::MediaRequest_Terminate* terminate_;
::Remote::MediaRequest_Prepare* prepare_;
::Remote::MediaRequest_GetPart* get_part_;
::Remote::MediaRequest_Terminate* terminate_;
int request_type_;
mutable int _cached_size_;
@@ -628,7 +630,7 @@ class MediaResponse_MediaPart : public ::google::protobuf::Message {
inline const ::google::protobuf::RepeatedPtrField< ::std::string>& data() const;
inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_data();
// @@protoc_insertion_point(class_scope:MediaResponse.MediaPart)
// @@protoc_insertion_point(class_scope:Remote.MediaResponse.MediaPart)
private:
inline void set_has_byte_offset();
inline void clear_has_byte_offset();
@@ -729,32 +731,32 @@ class MediaResponse : public ::google::protobuf::Message {
// accessors -------------------------------------------------------
// required .Error error = 1;
// required .Remote.Error error = 1;
inline bool has_error() const;
inline void clear_error();
static const int kErrorFieldNumber = 1;
inline const ::Error& error() const;
inline ::Error* mutable_error();
inline ::Error* release_error();
inline void set_allocated_error(::Error* error);
inline const ::Remote::Error& error() const;
inline ::Remote::Error* mutable_error();
inline ::Remote::Error* release_error();
inline void set_allocated_error(::Remote::Error* error);
// required .MediaResponse.Type response_type = 2;
// required .Remote.MediaResponse.Type response_type = 2;
inline bool has_response_type() const;
inline void clear_response_type();
static const int kResponseTypeFieldNumber = 2;
inline ::MediaResponse_Type response_type() const;
inline void set_response_type(::MediaResponse_Type value);
inline ::Remote::MediaResponse_Type response_type() const;
inline void set_response_type(::Remote::MediaResponse_Type value);
// optional .MediaResponse.MediaPart part = 3;
// optional .Remote.MediaResponse.MediaPart part = 3;
inline bool has_part() const;
inline void clear_part();
static const int kPartFieldNumber = 3;
inline const ::MediaResponse_MediaPart& part() const;
inline ::MediaResponse_MediaPart* mutable_part();
inline ::MediaResponse_MediaPart* release_part();
inline void set_allocated_part(::MediaResponse_MediaPart* part);
inline const ::Remote::MediaResponse_MediaPart& part() const;
inline ::Remote::MediaResponse_MediaPart* mutable_part();
inline ::Remote::MediaResponse_MediaPart* release_part();
inline void set_allocated_part(::Remote::MediaResponse_MediaPart* part);
// @@protoc_insertion_point(class_scope:MediaResponse)
// @@protoc_insertion_point(class_scope:Remote.MediaResponse)
private:
inline void set_has_error();
inline void clear_has_error();
@@ -765,8 +767,8 @@ class MediaResponse : public ::google::protobuf::Message {
::google::protobuf::UnknownFieldSet _unknown_fields_;
::Error* error_;
::MediaResponse_MediaPart* part_;
::Remote::Error* error_;
::Remote::MediaResponse_MediaPart* part_;
int response_type_;
mutable int _cached_size_;
@@ -830,7 +832,7 @@ inline void MediaRequest_Prepare::set_offset_secs(::google::protobuf::uint32 val
offset_secs_ = value;
}
// optional .CodecType codec_type = 3;
// optional .Remote.CodecType codec_type = 3;
inline bool MediaRequest_Prepare::has_codec_type() const {
return (_has_bits_[0] & 0x00000004u) != 0;
}
@@ -844,11 +846,11 @@ inline void MediaRequest_Prepare::clear_codec_type() {
codec_type_ = 1;
clear_has_codec_type();
}
inline ::CodecType MediaRequest_Prepare::codec_type() const {
return static_cast< ::CodecType >(codec_type_);
inline ::Remote::CodecType MediaRequest_Prepare::codec_type() const {
return static_cast< ::Remote::CodecType >(codec_type_);
}
inline void MediaRequest_Prepare::set_codec_type(::CodecType value) {
assert(::CodecType_IsValid(value));
inline void MediaRequest_Prepare::set_codec_type(::Remote::CodecType value) {
assert(::Remote::CodecType_IsValid(value));
set_has_codec_type();
codec_type_ = value;
}
@@ -997,7 +999,7 @@ inline void MediaRequest_GetPart::set_requested_data_size(::google::protobuf::ui
// MediaRequest
// required .MediaRequest.Type request_type = 1;
// required .Remote.MediaRequest.Type request_type = 1;
inline bool MediaRequest::has_request_type() const {
return (_has_bits_[0] & 0x00000001u) != 0;
}
@@ -1011,16 +1013,16 @@ inline void MediaRequest::clear_request_type() {
request_type_ = 1;
clear_has_request_type();
}
inline ::MediaRequest_Type MediaRequest::request_type() const {
return static_cast< ::MediaRequest_Type >(request_type_);
inline ::Remote::MediaRequest_Type MediaRequest::request_type() const {
return static_cast< ::Remote::MediaRequest_Type >(request_type_);
}
inline void MediaRequest::set_request_type(::MediaRequest_Type value) {
assert(::MediaRequest_Type_IsValid(value));
inline void MediaRequest::set_request_type(::Remote::MediaRequest_Type value) {
assert(::Remote::MediaRequest_Type_IsValid(value));
set_has_request_type();
request_type_ = value;
}
// optional .MediaRequest.Prepare prepare = 2;
// optional .Remote.MediaRequest.Prepare prepare = 2;
inline bool MediaRequest::has_prepare() const {
return (_has_bits_[0] & 0x00000002u) != 0;
}
@@ -1031,24 +1033,24 @@ inline void MediaRequest::clear_has_prepare() {
_has_bits_[0] &= ~0x00000002u;
}
inline void MediaRequest::clear_prepare() {
if (prepare_ != NULL) prepare_->::MediaRequest_Prepare::Clear();
if (prepare_ != NULL) prepare_->::Remote::MediaRequest_Prepare::Clear();
clear_has_prepare();
}
inline const ::MediaRequest_Prepare& MediaRequest::prepare() const {
inline const ::Remote::MediaRequest_Prepare& MediaRequest::prepare() const {
return prepare_ != NULL ? *prepare_ : *default_instance_->prepare_;
}
inline ::MediaRequest_Prepare* MediaRequest::mutable_prepare() {
inline ::Remote::MediaRequest_Prepare* MediaRequest::mutable_prepare() {
set_has_prepare();
if (prepare_ == NULL) prepare_ = new ::MediaRequest_Prepare;
if (prepare_ == NULL) prepare_ = new ::Remote::MediaRequest_Prepare;
return prepare_;
}
inline ::MediaRequest_Prepare* MediaRequest::release_prepare() {
inline ::Remote::MediaRequest_Prepare* MediaRequest::release_prepare() {
clear_has_prepare();
::MediaRequest_Prepare* temp = prepare_;
::Remote::MediaRequest_Prepare* temp = prepare_;
prepare_ = NULL;
return temp;
}
inline void MediaRequest::set_allocated_prepare(::MediaRequest_Prepare* prepare) {
inline void MediaRequest::set_allocated_prepare(::Remote::MediaRequest_Prepare* prepare) {
delete prepare_;
prepare_ = prepare;
if (prepare) {
@@ -1058,7 +1060,7 @@ inline void MediaRequest::set_allocated_prepare(::MediaRequest_Prepare* prepare)
}
}
// optional .MediaRequest.GetPart get_part = 3;
// optional .Remote.MediaRequest.GetPart get_part = 3;
inline bool MediaRequest::has_get_part() const {
return (_has_bits_[0] & 0x00000004u) != 0;
}
@@ -1069,24 +1071,24 @@ inline void MediaRequest::clear_has_get_part() {
_has_bits_[0] &= ~0x00000004u;
}
inline void MediaRequest::clear_get_part() {
if (get_part_ != NULL) get_part_->::MediaRequest_GetPart::Clear();
if (get_part_ != NULL) get_part_->::Remote::MediaRequest_GetPart::Clear();
clear_has_get_part();
}
inline const ::MediaRequest_GetPart& MediaRequest::get_part() const {
inline const ::Remote::MediaRequest_GetPart& MediaRequest::get_part() const {
return get_part_ != NULL ? *get_part_ : *default_instance_->get_part_;
}
inline ::MediaRequest_GetPart* MediaRequest::mutable_get_part() {
inline ::Remote::MediaRequest_GetPart* MediaRequest::mutable_get_part() {
set_has_get_part();
if (get_part_ == NULL) get_part_ = new ::MediaRequest_GetPart;
if (get_part_ == NULL) get_part_ = new ::Remote::MediaRequest_GetPart;
return get_part_;
}
inline ::MediaRequest_GetPart* MediaRequest::release_get_part() {
inline ::Remote::MediaRequest_GetPart* MediaRequest::release_get_part() {
clear_has_get_part();
::MediaRequest_GetPart* temp = get_part_;
::Remote::MediaRequest_GetPart* temp = get_part_;
get_part_ = NULL;
return temp;
}
inline void MediaRequest::set_allocated_get_part(::MediaRequest_GetPart* get_part) {
inline void MediaRequest::set_allocated_get_part(::Remote::MediaRequest_GetPart* get_part) {
delete get_part_;
get_part_ = get_part;
if (get_part) {
@@ -1096,7 +1098,7 @@ inline void MediaRequest::set_allocated_get_part(::MediaRequest_GetPart* get_par
}
}
// optional .MediaRequest.Terminate terminate = 4;
// optional .Remote.MediaRequest.Terminate terminate = 4;
inline bool MediaRequest::has_terminate() const {
return (_has_bits_[0] & 0x00000008u) != 0;
}
@@ -1107,24 +1109,24 @@ inline void MediaRequest::clear_has_terminate() {
_has_bits_[0] &= ~0x00000008u;
}
inline void MediaRequest::clear_terminate() {
if (terminate_ != NULL) terminate_->::MediaRequest_Terminate::Clear();
if (terminate_ != NULL) terminate_->::Remote::MediaRequest_Terminate::Clear();
clear_has_terminate();
}
inline const ::MediaRequest_Terminate& MediaRequest::terminate() const {
inline const ::Remote::MediaRequest_Terminate& MediaRequest::terminate() const {
return terminate_ != NULL ? *terminate_ : *default_instance_->terminate_;
}
inline ::MediaRequest_Terminate* MediaRequest::mutable_terminate() {
inline ::Remote::MediaRequest_Terminate* MediaRequest::mutable_terminate() {
set_has_terminate();
if (terminate_ == NULL) terminate_ = new ::MediaRequest_Terminate;
if (terminate_ == NULL) terminate_ = new ::Remote::MediaRequest_Terminate;
return terminate_;
}
inline ::MediaRequest_Terminate* MediaRequest::release_terminate() {
inline ::Remote::MediaRequest_Terminate* MediaRequest::release_terminate() {
clear_has_terminate();
::MediaRequest_Terminate* temp = terminate_;
::Remote::MediaRequest_Terminate* temp = terminate_;
terminate_ = NULL;
return temp;
}
inline void MediaRequest::set_allocated_terminate(::MediaRequest_Terminate* terminate) {
inline void MediaRequest::set_allocated_terminate(::Remote::MediaRequest_Terminate* terminate) {
delete terminate_;
terminate_ = terminate;
if (terminate) {
@@ -1208,7 +1210,7 @@ MediaResponse_MediaPart::mutable_data() {
// MediaResponse
// required .Error error = 1;
// required .Remote.Error error = 1;
inline bool MediaResponse::has_error() const {
return (_has_bits_[0] & 0x00000001u) != 0;
}
@@ -1219,24 +1221,24 @@ inline void MediaResponse::clear_has_error() {
_has_bits_[0] &= ~0x00000001u;
}
inline void MediaResponse::clear_error() {
if (error_ != NULL) error_->::Error::Clear();
if (error_ != NULL) error_->::Remote::Error::Clear();
clear_has_error();
}
inline const ::Error& MediaResponse::error() const {
inline const ::Remote::Error& MediaResponse::error() const {
return error_ != NULL ? *error_ : *default_instance_->error_;
}
inline ::Error* MediaResponse::mutable_error() {
inline ::Remote::Error* MediaResponse::mutable_error() {
set_has_error();
if (error_ == NULL) error_ = new ::Error;
if (error_ == NULL) error_ = new ::Remote::Error;
return error_;
}
inline ::Error* MediaResponse::release_error() {
inline ::Remote::Error* MediaResponse::release_error() {
clear_has_error();
::Error* temp = error_;
::Remote::Error* temp = error_;
error_ = NULL;
return temp;
}
inline void MediaResponse::set_allocated_error(::Error* error) {
inline void MediaResponse::set_allocated_error(::Remote::Error* error) {
delete error_;
error_ = error;
if (error) {
@@ -1246,7 +1248,7 @@ inline void MediaResponse::set_allocated_error(::Error* error) {
}
}
// required .MediaResponse.Type response_type = 2;
// required .Remote.MediaResponse.Type response_type = 2;
inline bool MediaResponse::has_response_type() const {
return (_has_bits_[0] & 0x00000002u) != 0;
}
@@ -1260,16 +1262,16 @@ inline void MediaResponse::clear_response_type() {
response_type_ = 1;
clear_has_response_type();
}
inline ::MediaResponse_Type MediaResponse::response_type() const {
return static_cast< ::MediaResponse_Type >(response_type_);
inline ::Remote::MediaResponse_Type MediaResponse::response_type() const {
return static_cast< ::Remote::MediaResponse_Type >(response_type_);
}
inline void MediaResponse::set_response_type(::MediaResponse_Type value) {
assert(::MediaResponse_Type_IsValid(value));
inline void MediaResponse::set_response_type(::Remote::MediaResponse_Type value) {
assert(::Remote::MediaResponse_Type_IsValid(value));
set_has_response_type();
response_type_ = value;
}
// optional .MediaResponse.MediaPart part = 3;
// optional .Remote.MediaResponse.MediaPart part = 3;
inline bool MediaResponse::has_part() const {
return (_has_bits_[0] & 0x00000004u) != 0;
}
@@ -1280,24 +1282,24 @@ inline void MediaResponse::clear_has_part() {
_has_bits_[0] &= ~0x00000004u;
}
inline void MediaResponse::clear_part() {
if (part_ != NULL) part_->::MediaResponse_MediaPart::Clear();
if (part_ != NULL) part_->::Remote::MediaResponse_MediaPart::Clear();
clear_has_part();
}
inline const ::MediaResponse_MediaPart& MediaResponse::part() const {
inline const ::Remote::MediaResponse_MediaPart& MediaResponse::part() const {
return part_ != NULL ? *part_ : *default_instance_->part_;
}
inline ::MediaResponse_MediaPart* MediaResponse::mutable_part() {
inline ::Remote::MediaResponse_MediaPart* MediaResponse::mutable_part() {
set_has_part();
if (part_ == NULL) part_ = new ::MediaResponse_MediaPart;
if (part_ == NULL) part_ = new ::Remote::MediaResponse_MediaPart;
return part_;
}
inline ::MediaResponse_MediaPart* MediaResponse::release_part() {
inline ::Remote::MediaResponse_MediaPart* MediaResponse::release_part() {
clear_has_part();
::MediaResponse_MediaPart* temp = part_;
::Remote::MediaResponse_MediaPart* temp = part_;
part_ = NULL;
return temp;
}
inline void MediaResponse::set_allocated_part(::MediaResponse_MediaPart* part) {
inline void MediaResponse::set_allocated_part(::Remote::MediaResponse_MediaPart* part) {
delete part_;
part_ = part;
if (part) {
@@ -1310,21 +1312,23 @@ inline void MediaResponse::set_allocated_part(::MediaResponse_MediaPart* part) {
// @@protoc_insertion_point(namespace_scope)
} // namespace Remote
#ifndef SWIG
namespace google {
namespace protobuf {
template <>
inline const EnumDescriptor* GetEnumDescriptor< ::MediaRequest_Type>() {
return ::MediaRequest_Type_descriptor();
inline const EnumDescriptor* GetEnumDescriptor< ::Remote::MediaRequest_Type>() {
return ::Remote::MediaRequest_Type_descriptor();
}
template <>
inline const EnumDescriptor* GetEnumDescriptor< ::MediaResponse_Type>() {
return ::MediaResponse_Type_descriptor();
inline const EnumDescriptor* GetEnumDescriptor< ::Remote::MediaResponse_Type>() {
return ::Remote::MediaResponse_Type_descriptor();
}
template <>
inline const EnumDescriptor* GetEnumDescriptor< ::CodecType>() {
return ::CodecType_descriptor();
inline const EnumDescriptor* GetEnumDescriptor< ::Remote::CodecType>() {
return ::Remote::CodecType_descriptor();
}
} // namespace google
remote/messages/messages.pb.cc
+117 -111
View File
@@ -16,6 +16,8 @@
#include <google/protobuf/wire_format.h>
// @@protoc_insertion_point(includes)
namespace Remote {
namespace {
const ::google::protobuf::Descriptor* ClientMessage_descriptor_ = NULL;
@@ -40,7 +42,7 @@ void protobuf_AssignDesc_messages_2eproto() {
static const int ClientMessage_offsets_[4] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientMessage, type_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientMessage, auth_request_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientMessage, collection_request_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientMessage, audio_collection_request_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientMessage, media_request_),
};
ClientMessage_reflection_ =
@@ -59,7 +61,7 @@ void protobuf_AssignDesc_messages_2eproto() {
static const int ServerMessage_offsets_[4] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServerMessage, type_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServerMessage, auth_response_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServerMessage, collection_response_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServerMessage, audio_collection_response_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServerMessage, media_response_),
};
ServerMessage_reflection_ =
@@ -107,26 +109,28 @@ void protobuf_AddDesc_messages_2eproto() {
already_here = true;
GOOGLE_PROTOBUF_VERIFY_VERSION;
::protobuf_AddDesc_common_2eproto();
::protobuf_AddDesc_auth_2eproto();
::protobuf_AddDesc_collection_2eproto();
::protobuf_AddDesc_media_2eproto();
::Remote::protobuf_AddDesc_common_2eproto();
::Remote::protobuf_AddDesc_auth_2eproto();
::Remote::protobuf_AddDesc_collection_2eproto();
::Remote::protobuf_AddDesc_media_2eproto();
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
"\n\016messages.proto\032\014common.proto\032\nauth.pro"
"to\032\020collection.proto\032\013media.proto\"\356\001\n\rCl"
"ientMessage\022!\n\004type\030\001 \002(\0162\023.ClientMessag"
"e.Type\022\"\n\014auth_request\030\002 \001(\0132\014.AuthReque"
"st\022.\n\022collection_request\030\003 \001(\0132\022.Collect"
"ionRequest\022$\n\rmedia_request\030\004 \001(\0132\r.Medi"
"aRequest\"@\n\004Type\022\017\n\013AuthRequest\020\001\022\025\n\021Col"
"lectionRequest\020\002\022\020\n\014MediaRequest\020\003\"\367\001\n\rS"
"erverMessage\022!\n\004type\030\001 \002(\0162\023.ServerMessa"
"ge.Type\022$\n\rauth_response\030\002 \001(\0132\r.AuthRes"
"ponse\0220\n\023collection_response\030\003 \001(\0132\023.Col"
"lectionResponse\022&\n\016media_response\030\004 \001(\0132"
"\016.MediaResponse\"C\n\004Type\022\020\n\014AuthResponse\020"
"\001\022\026\n\022CollectionResponse\020\002\022\021\n\rMediaRespon"
"se\020\003", 564);
"\n\016messages.proto\022\006Remote\032\014common.proto\032\n"
"auth.proto\032\020collection.proto\032\013media.prot"
"o\"\232\002\n\rClientMessage\022(\n\004type\030\001 \002(\0162\032.Remo"
"te.ClientMessage.Type\022)\n\014auth_request\030\002 "
"\001(\0132\023.Remote.AuthRequest\022@\n\030audio_collec"
"tion_request\030\003 \001(\0132\036.Remote.AudioCollect"
"ionRequest\022+\n\rmedia_request\030\004 \001(\0132\024.Remo"
"te.MediaRequest\"E\n\004Type\022\017\n\013AuthRequest\020\001"
"\022\032\n\026AudioCollectionRequest\020\002\022\020\n\014MediaReq"
"uest\020\003\"\243\002\n\rServerMessage\022(\n\004type\030\001 \002(\0162\032"
".Remote.ServerMessage.Type\022+\n\rauth_respo"
"nse\030\002 \001(\0132\024.Remote.AuthResponse\022B\n\031audio"
"_collection_response\030\003 \001(\0132\037.Remote.Audi"
"oCollectionResponse\022-\n\016media_response\030\004 "
"\001(\0132\025.Remote.MediaResponse\"H\n\004Type\022\020\n\014Au"
"thResponse\020\001\022\033\n\027AduioCollectionResponse\020"
"\002\022\021\n\rMediaResponse\020\003", 660);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"messages.proto", &protobuf_RegisterTypes);
ClientMessage::default_instance_ = new ClientMessage();
@@ -162,7 +166,7 @@ bool ClientMessage_Type_IsValid(int value) {
#ifndef _MSC_VER
const ClientMessage_Type ClientMessage::AuthRequest;
const ClientMessage_Type ClientMessage::CollectionRequest;
const ClientMessage_Type ClientMessage::AudioCollectionRequest;
const ClientMessage_Type ClientMessage::MediaRequest;
const ClientMessage_Type ClientMessage::Type_MIN;
const ClientMessage_Type ClientMessage::Type_MAX;
@@ -171,7 +175,7 @@ const int ClientMessage::Type_ARRAYSIZE;
#ifndef _MSC_VER
const int ClientMessage::kTypeFieldNumber;
const int ClientMessage::kAuthRequestFieldNumber;
const int ClientMessage::kCollectionRequestFieldNumber;
const int ClientMessage::kAudioCollectionRequestFieldNumber;
const int ClientMessage::kMediaRequestFieldNumber;
#endif // !_MSC_VER
@@ -181,9 +185,9 @@ ClientMessage::ClientMessage()
}
void ClientMessage::InitAsDefaultInstance() {
auth_request_ = const_cast< ::AuthRequest*>(&::AuthRequest::default_instance());
collection_request_ = const_cast< ::CollectionRequest*>(&::CollectionRequest::default_instance());
media_request_ = const_cast< ::MediaRequest*>(&::MediaRequest::default_instance());
auth_request_ = const_cast< ::Remote::AuthRequest*>(&::Remote::AuthRequest::default_instance());
audio_collection_request_ = const_cast< ::Remote::AudioCollectionRequest*>(&::Remote::AudioCollectionRequest::default_instance());
media_request_ = const_cast< ::Remote::MediaRequest*>(&::Remote::MediaRequest::default_instance());
}
ClientMessage::ClientMessage(const ClientMessage& from)
@@ -196,7 +200,7 @@ void ClientMessage::SharedCtor() {
_cached_size_ = 0;
type_ = 1;
auth_request_ = NULL;
collection_request_ = NULL;
audio_collection_request_ = NULL;
media_request_ = NULL;
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@@ -208,7 +212,7 @@ ClientMessage::~ClientMessage() {
void ClientMessage::SharedDtor() {
if (this != default_instance_) {
delete auth_request_;
delete collection_request_;
delete audio_collection_request_;
delete media_request_;
}
}
@@ -238,13 +242,13 @@ void ClientMessage::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
type_ = 1;
if (has_auth_request()) {
if (auth_request_ != NULL) auth_request_->::AuthRequest::Clear();
if (auth_request_ != NULL) auth_request_->::Remote::AuthRequest::Clear();
}
if (has_collection_request()) {
if (collection_request_ != NULL) collection_request_->::CollectionRequest::Clear();
if (has_audio_collection_request()) {
if (audio_collection_request_ != NULL) audio_collection_request_->::Remote::AudioCollectionRequest::Clear();
}
if (has_media_request()) {
if (media_request_ != NULL) media_request_->::MediaRequest::Clear();
if (media_request_ != NULL) media_request_->::Remote::MediaRequest::Clear();
}
}
::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -257,7 +261,7 @@ bool ClientMessage::MergePartialFromCodedStream(
::google::protobuf::uint32 tag;
while ((tag = input->ReadTag()) != 0) {
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// required .ClientMessage.Type type = 1;
// required .Remote.ClientMessage.Type type = 1;
case 1: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -265,8 +269,8 @@ bool ClientMessage::MergePartialFromCodedStream(
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
input, &value)));
if (::ClientMessage_Type_IsValid(value)) {
set_type(static_cast< ::ClientMessage_Type >(value));
if (::Remote::ClientMessage_Type_IsValid(value)) {
set_type(static_cast< ::Remote::ClientMessage_Type >(value));
} else {
mutable_unknown_fields()->AddVarint(1, value);
}
@@ -277,7 +281,7 @@ bool ClientMessage::MergePartialFromCodedStream(
break;
}
// optional .AuthRequest auth_request = 2;
// optional .Remote.AuthRequest auth_request = 2;
case 2: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -287,17 +291,17 @@ bool ClientMessage::MergePartialFromCodedStream(
} else {
goto handle_uninterpreted;
}
if (input->ExpectTag(26)) goto parse_collection_request;
if (input->ExpectTag(26)) goto parse_audio_collection_request;
break;
}
// optional .CollectionRequest collection_request = 3;
// optional .Remote.AudioCollectionRequest audio_collection_request = 3;
case 3: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
parse_collection_request:
parse_audio_collection_request:
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, mutable_collection_request()));
input, mutable_audio_collection_request()));
} else {
goto handle_uninterpreted;
}
@@ -305,7 +309,7 @@ bool ClientMessage::MergePartialFromCodedStream(
break;
}
// optional .MediaRequest media_request = 4;
// optional .Remote.MediaRequest media_request = 4;
case 4: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -337,25 +341,25 @@ bool ClientMessage::MergePartialFromCodedStream(
void ClientMessage::SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const {
// required .ClientMessage.Type type = 1;
// required .Remote.ClientMessage.Type type = 1;
if (has_type()) {
::google::protobuf::internal::WireFormatLite::WriteEnum(
1, this->type(), output);
}
// optional .AuthRequest auth_request = 2;
// optional .Remote.AuthRequest auth_request = 2;
if (has_auth_request()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
2, this->auth_request(), output);
}
// optional .CollectionRequest collection_request = 3;
if (has_collection_request()) {
// optional .Remote.AudioCollectionRequest audio_collection_request = 3;
if (has_audio_collection_request()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
3, this->collection_request(), output);
3, this->audio_collection_request(), output);
}
// optional .MediaRequest media_request = 4;
// optional .Remote.MediaRequest media_request = 4;
if (has_media_request()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
4, this->media_request(), output);
@@ -369,27 +373,27 @@ void ClientMessage::SerializeWithCachedSizes(
::google::protobuf::uint8* ClientMessage::SerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const {
// required .ClientMessage.Type type = 1;
// required .Remote.ClientMessage.Type type = 1;
if (has_type()) {
target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
1, this->type(), target);
}
// optional .AuthRequest auth_request = 2;
// optional .Remote.AuthRequest auth_request = 2;
if (has_auth_request()) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
2, this->auth_request(), target);
}
// optional .CollectionRequest collection_request = 3;
if (has_collection_request()) {
// optional .Remote.AudioCollectionRequest audio_collection_request = 3;
if (has_audio_collection_request()) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
3, this->collection_request(), target);
3, this->audio_collection_request(), target);
}
// optional .MediaRequest media_request = 4;
// optional .Remote.MediaRequest media_request = 4;
if (has_media_request()) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
@@ -407,27 +411,27 @@ int ClientMessage::ByteSize() const {
int total_size = 0;
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
// required .ClientMessage.Type type = 1;
// required .Remote.ClientMessage.Type type = 1;
if (has_type()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::EnumSize(this->type());
}
// optional .AuthRequest auth_request = 2;
// optional .Remote.AuthRequest auth_request = 2;
if (has_auth_request()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
this->auth_request());
}
// optional .CollectionRequest collection_request = 3;
if (has_collection_request()) {
// optional .Remote.AudioCollectionRequest audio_collection_request = 3;
if (has_audio_collection_request()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
this->collection_request());
this->audio_collection_request());
}
// optional .MediaRequest media_request = 4;
// optional .Remote.MediaRequest media_request = 4;
if (has_media_request()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -465,13 +469,13 @@ void ClientMessage::MergeFrom(const ClientMessage& from) {
set_type(from.type());
}
if (from.has_auth_request()) {
mutable_auth_request()->::AuthRequest::MergeFrom(from.auth_request());
mutable_auth_request()->::Remote::AuthRequest::MergeFrom(from.auth_request());
}
if (from.has_collection_request()) {
mutable_collection_request()->::CollectionRequest::MergeFrom(from.collection_request());
if (from.has_audio_collection_request()) {
mutable_audio_collection_request()->::Remote::AudioCollectionRequest::MergeFrom(from.audio_collection_request());
}
if (from.has_media_request()) {
mutable_media_request()->::MediaRequest::MergeFrom(from.media_request());
mutable_media_request()->::Remote::MediaRequest::MergeFrom(from.media_request());
}
}
mutable_unknown_fields()->MergeFrom(from.unknown_fields());
@@ -495,8 +499,8 @@ bool ClientMessage::IsInitialized() const {
if (has_auth_request()) {
if (!this->auth_request().IsInitialized()) return false;
}
if (has_collection_request()) {
if (!this->collection_request().IsInitialized()) return false;
if (has_audio_collection_request()) {
if (!this->audio_collection_request().IsInitialized()) return false;
}
if (has_media_request()) {
if (!this->media_request().IsInitialized()) return false;
@@ -508,7 +512,7 @@ void ClientMessage::Swap(ClientMessage* other) {
if (other != this) {
std::swap(type_, other->type_);
std::swap(auth_request_, other->auth_request_);
std::swap(collection_request_, other->collection_request_);
std::swap(audio_collection_request_, other->audio_collection_request_);
std::swap(media_request_, other->media_request_);
std::swap(_has_bits_[0], other->_has_bits_[0]);
_unknown_fields_.Swap(&other->_unknown_fields_);
@@ -544,7 +548,7 @@ bool ServerMessage_Type_IsValid(int value) {
#ifndef _MSC_VER
const ServerMessage_Type ServerMessage::AuthResponse;
const ServerMessage_Type ServerMessage::CollectionResponse;
const ServerMessage_Type ServerMessage::AduioCollectionResponse;
const ServerMessage_Type ServerMessage::MediaResponse;
const ServerMessage_Type ServerMessage::Type_MIN;
const ServerMessage_Type ServerMessage::Type_MAX;
@@ -553,7 +557,7 @@ const int ServerMessage::Type_ARRAYSIZE;
#ifndef _MSC_VER
const int ServerMessage::kTypeFieldNumber;
const int ServerMessage::kAuthResponseFieldNumber;
const int ServerMessage::kCollectionResponseFieldNumber;
const int ServerMessage::kAudioCollectionResponseFieldNumber;
const int ServerMessage::kMediaResponseFieldNumber;
#endif // !_MSC_VER
@@ -563,9 +567,9 @@ ServerMessage::ServerMessage()
}
void ServerMessage::InitAsDefaultInstance() {
auth_response_ = const_cast< ::AuthResponse*>(&::AuthResponse::default_instance());
collection_response_ = const_cast< ::CollectionResponse*>(&::CollectionResponse::default_instance());
media_response_ = const_cast< ::MediaResponse*>(&::MediaResponse::default_instance());
auth_response_ = const_cast< ::Remote::AuthResponse*>(&::Remote::AuthResponse::default_instance());
audio_collection_response_ = const_cast< ::Remote::AudioCollectionResponse*>(&::Remote::AudioCollectionResponse::default_instance());
media_response_ = const_cast< ::Remote::MediaResponse*>(&::Remote::MediaResponse::default_instance());
}
ServerMessage::ServerMessage(const ServerMessage& from)
@@ -578,7 +582,7 @@ void ServerMessage::SharedCtor() {
_cached_size_ = 0;
type_ = 1;
auth_response_ = NULL;
collection_response_ = NULL;
audio_collection_response_ = NULL;
media_response_ = NULL;
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@@ -590,7 +594,7 @@ ServerMessage::~ServerMessage() {
void ServerMessage::SharedDtor() {
if (this != default_instance_) {
delete auth_response_;
delete collection_response_;
delete audio_collection_response_;
delete media_response_;
}
}
@@ -620,13 +624,13 @@ void ServerMessage::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
type_ = 1;
if (has_auth_response()) {
if (auth_response_ != NULL) auth_response_->::AuthResponse::Clear();
if (auth_response_ != NULL) auth_response_->::Remote::AuthResponse::Clear();
}
if (has_collection_response()) {
if (collection_response_ != NULL) collection_response_->::CollectionResponse::Clear();
if (has_audio_collection_response()) {
if (audio_collection_response_ != NULL) audio_collection_response_->::Remote::AudioCollectionResponse::Clear();
}
if (has_media_response()) {
if (media_response_ != NULL) media_response_->::MediaResponse::Clear();
if (media_response_ != NULL) media_response_->::Remote::MediaResponse::Clear();
}
}
::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -639,7 +643,7 @@ bool ServerMessage::MergePartialFromCodedStream(
::google::protobuf::uint32 tag;
while ((tag = input->ReadTag()) != 0) {
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// required .ServerMessage.Type type = 1;
// required .Remote.ServerMessage.Type type = 1;
case 1: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -647,8 +651,8 @@ bool ServerMessage::MergePartialFromCodedStream(
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
input, &value)));
if (::ServerMessage_Type_IsValid(value)) {
set_type(static_cast< ::ServerMessage_Type >(value));
if (::Remote::ServerMessage_Type_IsValid(value)) {
set_type(static_cast< ::Remote::ServerMessage_Type >(value));
} else {
mutable_unknown_fields()->AddVarint(1, value);
}
@@ -659,7 +663,7 @@ bool ServerMessage::MergePartialFromCodedStream(
break;
}
// optional .AuthResponse auth_response = 2;
// optional .Remote.AuthResponse auth_response = 2;
case 2: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -669,17 +673,17 @@ bool ServerMessage::MergePartialFromCodedStream(
} else {
goto handle_uninterpreted;
}
if (input->ExpectTag(26)) goto parse_collection_response;
if (input->ExpectTag(26)) goto parse_audio_collection_response;
break;
}
// optional .CollectionResponse collection_response = 3;
// optional .Remote.AudioCollectionResponse audio_collection_response = 3;
case 3: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
parse_collection_response:
parse_audio_collection_response:
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, mutable_collection_response()));
input, mutable_audio_collection_response()));
} else {
goto handle_uninterpreted;
}
@@ -687,7 +691,7 @@ bool ServerMessage::MergePartialFromCodedStream(
break;
}
// optional .MediaResponse media_response = 4;
// optional .Remote.MediaResponse media_response = 4;
case 4: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -719,25 +723,25 @@ bool ServerMessage::MergePartialFromCodedStream(
void ServerMessage::SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const {
// required .ServerMessage.Type type = 1;
// required .Remote.ServerMessage.Type type = 1;
if (has_type()) {
::google::protobuf::internal::WireFormatLite::WriteEnum(
1, this->type(), output);
}
// optional .AuthResponse auth_response = 2;
// optional .Remote.AuthResponse auth_response = 2;
if (has_auth_response()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
2, this->auth_response(), output);
}
// optional .CollectionResponse collection_response = 3;
if (has_collection_response()) {
// optional .Remote.AudioCollectionResponse audio_collection_response = 3;
if (has_audio_collection_response()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
3, this->collection_response(), output);
3, this->audio_collection_response(), output);
}
// optional .MediaResponse media_response = 4;
// optional .Remote.MediaResponse media_response = 4;
if (has_media_response()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
4, this->media_response(), output);
@@ -751,27 +755,27 @@ void ServerMessage::SerializeWithCachedSizes(
::google::protobuf::uint8* ServerMessage::SerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const {
// required .ServerMessage.Type type = 1;
// required .Remote.ServerMessage.Type type = 1;
if (has_type()) {
target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
1, this->type(), target);
}
// optional .AuthResponse auth_response = 2;
// optional .Remote.AuthResponse auth_response = 2;
if (has_auth_response()) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
2, this->auth_response(), target);
}
// optional .CollectionResponse collection_response = 3;
if (has_collection_response()) {
// optional .Remote.AudioCollectionResponse audio_collection_response = 3;
if (has_audio_collection_response()) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
3, this->collection_response(), target);
3, this->audio_collection_response(), target);
}
// optional .MediaResponse media_response = 4;
// optional .Remote.MediaResponse media_response = 4;
if (has_media_response()) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
@@ -789,27 +793,27 @@ int ServerMessage::ByteSize() const {
int total_size = 0;
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
// required .ServerMessage.Type type = 1;
// required .Remote.ServerMessage.Type type = 1;
if (has_type()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::EnumSize(this->type());
}
// optional .AuthResponse auth_response = 2;
// optional .Remote.AuthResponse auth_response = 2;
if (has_auth_response()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
this->auth_response());
}
// optional .CollectionResponse collection_response = 3;
if (has_collection_response()) {
// optional .Remote.AudioCollectionResponse audio_collection_response = 3;
if (has_audio_collection_response()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
this->collection_response());
this->audio_collection_response());
}
// optional .MediaResponse media_response = 4;
// optional .Remote.MediaResponse media_response = 4;
if (has_media_response()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -847,13 +851,13 @@ void ServerMessage::MergeFrom(const ServerMessage& from) {
set_type(from.type());
}
if (from.has_auth_response()) {
mutable_auth_response()->::AuthResponse::MergeFrom(from.auth_response());
mutable_auth_response()->::Remote::AuthResponse::MergeFrom(from.auth_response());
}
if (from.has_collection_response()) {
mutable_collection_response()->::CollectionResponse::MergeFrom(from.collection_response());
if (from.has_audio_collection_response()) {
mutable_audio_collection_response()->::Remote::AudioCollectionResponse::MergeFrom(from.audio_collection_response());
}
if (from.has_media_response()) {
mutable_media_response()->::MediaResponse::MergeFrom(from.media_response());
mutable_media_response()->::Remote::MediaResponse::MergeFrom(from.media_response());
}
}
mutable_unknown_fields()->MergeFrom(from.unknown_fields());
@@ -877,8 +881,8 @@ bool ServerMessage::IsInitialized() const {
if (has_auth_response()) {
if (!this->auth_response().IsInitialized()) return false;
}
if (has_collection_response()) {
if (!this->collection_response().IsInitialized()) return false;
if (has_audio_collection_response()) {
if (!this->audio_collection_response().IsInitialized()) return false;
}
if (has_media_response()) {
if (!this->media_response().IsInitialized()) return false;
@@ -890,7 +894,7 @@ void ServerMessage::Swap(ServerMessage* other) {
if (other != this) {
std::swap(type_, other->type_);
std::swap(auth_response_, other->auth_response_);
std::swap(collection_response_, other->collection_response_);
std::swap(audio_collection_response_, other->audio_collection_response_);
std::swap(media_response_, other->media_response_);
std::swap(_has_bits_[0], other->_has_bits_[0]);
_unknown_fields_.Swap(&other->_unknown_fields_);
@@ -909,4 +913,6 @@ void ServerMessage::Swap(ServerMessage* other) {
// @@protoc_insertion_point(namespace_scope)
} // namespace Remote
// @@protoc_insertion_point(global_scope)
remote/messages/messages.pb.h
+154 -150
View File
@@ -31,6 +31,8 @@
#include "media.pb.h"
// @@protoc_insertion_point(includes)
namespace Remote {
// Internal implementation detail -- do not call these.
void protobuf_AddDesc_messages_2eproto();
void protobuf_AssignDesc_messages_2eproto();
@@ -41,7 +43,7 @@ class ServerMessage;
enum ClientMessage_Type {
ClientMessage_Type_AuthRequest = 1,
ClientMessage_Type_CollectionRequest = 2,
ClientMessage_Type_AudioCollectionRequest = 2,
ClientMessage_Type_MediaRequest = 3
};
bool ClientMessage_Type_IsValid(int value);
@@ -61,7 +63,7 @@ inline bool ClientMessage_Type_Parse(
}
enum ServerMessage_Type {
ServerMessage_Type_AuthResponse = 1,
ServerMessage_Type_CollectionResponse = 2,
ServerMessage_Type_AduioCollectionResponse = 2,
ServerMessage_Type_MediaResponse = 3
};
bool ServerMessage_Type_IsValid(int value);
@@ -135,7 +137,7 @@ class ClientMessage : public ::google::protobuf::Message {
typedef ClientMessage_Type Type;
static const Type AuthRequest = ClientMessage_Type_AuthRequest;
static const Type CollectionRequest = ClientMessage_Type_CollectionRequest;
static const Type AudioCollectionRequest = ClientMessage_Type_AudioCollectionRequest;
static const Type MediaRequest = ClientMessage_Type_MediaRequest;
static inline bool Type_IsValid(int value) {
return ClientMessage_Type_IsValid(value);
@@ -160,56 +162,56 @@ class ClientMessage : public ::google::protobuf::Message {
// accessors -------------------------------------------------------
// required .ClientMessage.Type type = 1;
// required .Remote.ClientMessage.Type type = 1;
inline bool has_type() const;
inline void clear_type();
static const int kTypeFieldNumber = 1;
inline ::ClientMessage_Type type() const;
inline void set_type(::ClientMessage_Type value);
inline ::Remote::ClientMessage_Type type() const;
inline void set_type(::Remote::ClientMessage_Type value);
// optional .AuthRequest auth_request = 2;
// optional .Remote.AuthRequest auth_request = 2;
inline bool has_auth_request() const;
inline void clear_auth_request();
static const int kAuthRequestFieldNumber = 2;
inline const ::AuthRequest& auth_request() const;
inline ::AuthRequest* mutable_auth_request();
inline ::AuthRequest* release_auth_request();
inline void set_allocated_auth_request(::AuthRequest* auth_request);
inline const ::Remote::AuthRequest& auth_request() const;
inline ::Remote::AuthRequest* mutable_auth_request();
inline ::Remote::AuthRequest* release_auth_request();
inline void set_allocated_auth_request(::Remote::AuthRequest* auth_request);
// optional .CollectionRequest collection_request = 3;
inline bool has_collection_request() const;
inline void clear_collection_request();
static const int kCollectionRequestFieldNumber = 3;
inline const ::CollectionRequest& collection_request() const;
inline ::CollectionRequest* mutable_collection_request();
inline ::CollectionRequest* release_collection_request();
inline void set_allocated_collection_request(::CollectionRequest* collection_request);
// optional .Remote.AudioCollectionRequest audio_collection_request = 3;
inline bool has_audio_collection_request() const;
inline void clear_audio_collection_request();
static const int kAudioCollectionRequestFieldNumber = 3;
inline const ::Remote::AudioCollectionRequest& audio_collection_request() const;
inline ::Remote::AudioCollectionRequest* mutable_audio_collection_request();
inline ::Remote::AudioCollectionRequest* release_audio_collection_request();
inline void set_allocated_audio_collection_request(::Remote::AudioCollectionRequest* audio_collection_request);
// optional .MediaRequest media_request = 4;
// optional .Remote.MediaRequest media_request = 4;
inline bool has_media_request() const;
inline void clear_media_request();
static const int kMediaRequestFieldNumber = 4;
inline const ::MediaRequest& media_request() const;
inline ::MediaRequest* mutable_media_request();
inline ::MediaRequest* release_media_request();
inline void set_allocated_media_request(::MediaRequest* media_request);
inline const ::Remote::MediaRequest& media_request() const;
inline ::Remote::MediaRequest* mutable_media_request();
inline ::Remote::MediaRequest* release_media_request();
inline void set_allocated_media_request(::Remote::MediaRequest* media_request);
// @@protoc_insertion_point(class_scope:ClientMessage)
// @@protoc_insertion_point(class_scope:Remote.ClientMessage)
private:
inline void set_has_type();
inline void clear_has_type();
inline void set_has_auth_request();
inline void clear_has_auth_request();
inline void set_has_collection_request();
inline void clear_has_collection_request();
inline void set_has_audio_collection_request();
inline void clear_has_audio_collection_request();
inline void set_has_media_request();
inline void clear_has_media_request();
::google::protobuf::UnknownFieldSet _unknown_fields_;
::AuthRequest* auth_request_;
::CollectionRequest* collection_request_;
::MediaRequest* media_request_;
::Remote::AuthRequest* auth_request_;
::Remote::AudioCollectionRequest* audio_collection_request_;
::Remote::MediaRequest* media_request_;
int type_;
mutable int _cached_size_;
@@ -278,7 +280,7 @@ class ServerMessage : public ::google::protobuf::Message {
typedef ServerMessage_Type Type;
static const Type AuthResponse = ServerMessage_Type_AuthResponse;
static const Type CollectionResponse = ServerMessage_Type_CollectionResponse;
static const Type AduioCollectionResponse = ServerMessage_Type_AduioCollectionResponse;
static const Type MediaResponse = ServerMessage_Type_MediaResponse;
static inline bool Type_IsValid(int value) {
return ServerMessage_Type_IsValid(value);
@@ -303,56 +305,56 @@ class ServerMessage : public ::google::protobuf::Message {
// accessors -------------------------------------------------------
// required .ServerMessage.Type type = 1;
// required .Remote.ServerMessage.Type type = 1;
inline bool has_type() const;
inline void clear_type();
static const int kTypeFieldNumber = 1;
inline ::ServerMessage_Type type() const;
inline void set_type(::ServerMessage_Type value);
inline ::Remote::ServerMessage_Type type() const;
inline void set_type(::Remote::ServerMessage_Type value);
// optional .AuthResponse auth_response = 2;
// optional .Remote.AuthResponse auth_response = 2;
inline bool has_auth_response() const;
inline void clear_auth_response();
static const int kAuthResponseFieldNumber = 2;
inline const ::AuthResponse& auth_response() const;
inline ::AuthResponse* mutable_auth_response();
inline ::AuthResponse* release_auth_response();
inline void set_allocated_auth_response(::AuthResponse* auth_response);
inline const ::Remote::AuthResponse& auth_response() const;
inline ::Remote::AuthResponse* mutable_auth_response();
inline ::Remote::AuthResponse* release_auth_response();
inline void set_allocated_auth_response(::Remote::AuthResponse* auth_response);
// optional .CollectionResponse collection_response = 3;
inline bool has_collection_response() const;
inline void clear_collection_response();
static const int kCollectionResponseFieldNumber = 3;
inline const ::CollectionResponse& collection_response() const;
inline ::CollectionResponse* mutable_collection_response();
inline ::CollectionResponse* release_collection_response();
inline void set_allocated_collection_response(::CollectionResponse* collection_response);
// optional .Remote.AudioCollectionResponse audio_collection_response = 3;
inline bool has_audio_collection_response() const;
inline void clear_audio_collection_response();
static const int kAudioCollectionResponseFieldNumber = 3;
inline const ::Remote::AudioCollectionResponse& audio_collection_response() const;
inline ::Remote::AudioCollectionResponse* mutable_audio_collection_response();
inline ::Remote::AudioCollectionResponse* release_audio_collection_response();
inline void set_allocated_audio_collection_response(::Remote::AudioCollectionResponse* audio_collection_response);
// optional .MediaResponse media_response = 4;
// optional .Remote.MediaResponse media_response = 4;
inline bool has_media_response() const;
inline void clear_media_response();
static const int kMediaResponseFieldNumber = 4;
inline const ::MediaResponse& media_response() const;
inline ::MediaResponse* mutable_media_response();
inline ::MediaResponse* release_media_response();
inline void set_allocated_media_response(::MediaResponse* media_response);
inline const ::Remote::MediaResponse& media_response() const;
inline ::Remote::MediaResponse* mutable_media_response();
inline ::Remote::MediaResponse* release_media_response();
inline void set_allocated_media_response(::Remote::MediaResponse* media_response);
// @@protoc_insertion_point(class_scope:ServerMessage)
// @@protoc_insertion_point(class_scope:Remote.ServerMessage)
private:
inline void set_has_type();
inline void clear_has_type();
inline void set_has_auth_response();
inline void clear_has_auth_response();
inline void set_has_collection_response();
inline void clear_has_collection_response();
inline void set_has_audio_collection_response();
inline void clear_has_audio_collection_response();
inline void set_has_media_response();
inline void clear_has_media_response();
::google::protobuf::UnknownFieldSet _unknown_fields_;
::AuthResponse* auth_response_;
::CollectionResponse* collection_response_;
::MediaResponse* media_response_;
::Remote::AuthResponse* auth_response_;
::Remote::AudioCollectionResponse* audio_collection_response_;
::Remote::MediaResponse* media_response_;
int type_;
mutable int _cached_size_;
@@ -372,7 +374,7 @@ class ServerMessage : public ::google::protobuf::Message {
// ClientMessage
// required .ClientMessage.Type type = 1;
// required .Remote.ClientMessage.Type type = 1;
inline bool ClientMessage::has_type() const {
return (_has_bits_[0] & 0x00000001u) != 0;
}
@@ -386,16 +388,16 @@ inline void ClientMessage::clear_type() {
type_ = 1;
clear_has_type();
}
inline ::ClientMessage_Type ClientMessage::type() const {
return static_cast< ::ClientMessage_Type >(type_);
inline ::Remote::ClientMessage_Type ClientMessage::type() const {
return static_cast< ::Remote::ClientMessage_Type >(type_);
}
inline void ClientMessage::set_type(::ClientMessage_Type value) {
assert(::ClientMessage_Type_IsValid(value));
inline void ClientMessage::set_type(::Remote::ClientMessage_Type value) {
assert(::Remote::ClientMessage_Type_IsValid(value));
set_has_type();
type_ = value;
}
// optional .AuthRequest auth_request = 2;
// optional .Remote.AuthRequest auth_request = 2;
inline bool ClientMessage::has_auth_request() const {
return (_has_bits_[0] & 0x00000002u) != 0;
}
@@ -406,24 +408,24 @@ inline void ClientMessage::clear_has_auth_request() {
_has_bits_[0] &= ~0x00000002u;
}
inline void ClientMessage::clear_auth_request() {
if (auth_request_ != NULL) auth_request_->::AuthRequest::Clear();
if (auth_request_ != NULL) auth_request_->::Remote::AuthRequest::Clear();
clear_has_auth_request();
}
inline const ::AuthRequest& ClientMessage::auth_request() const {
inline const ::Remote::AuthRequest& ClientMessage::auth_request() const {
return auth_request_ != NULL ? *auth_request_ : *default_instance_->auth_request_;
}
inline ::AuthRequest* ClientMessage::mutable_auth_request() {
inline ::Remote::AuthRequest* ClientMessage::mutable_auth_request() {
set_has_auth_request();
if (auth_request_ == NULL) auth_request_ = new ::AuthRequest;
if (auth_request_ == NULL) auth_request_ = new ::Remote::AuthRequest;
return auth_request_;
}
inline ::AuthRequest* ClientMessage::release_auth_request() {
inline ::Remote::AuthRequest* ClientMessage::release_auth_request() {
clear_has_auth_request();
::AuthRequest* temp = auth_request_;
::Remote::AuthRequest* temp = auth_request_;
auth_request_ = NULL;
return temp;
}
inline void ClientMessage::set_allocated_auth_request(::AuthRequest* auth_request) {
inline void ClientMessage::set_allocated_auth_request(::Remote::AuthRequest* auth_request) {
delete auth_request_;
auth_request_ = auth_request;
if (auth_request) {
@@ -433,45 +435,45 @@ inline void ClientMessage::set_allocated_auth_request(::AuthRequest* auth_reques
}
}
// optional .CollectionRequest collection_request = 3;
inline bool ClientMessage::has_collection_request() const {
// optional .Remote.AudioCollectionRequest audio_collection_request = 3;
inline bool ClientMessage::has_audio_collection_request() const {
return (_has_bits_[0] & 0x00000004u) != 0;
}
inline void ClientMessage::set_has_collection_request() {
inline void ClientMessage::set_has_audio_collection_request() {
_has_bits_[0] |= 0x00000004u;
}
inline void ClientMessage::clear_has_collection_request() {
inline void ClientMessage::clear_has_audio_collection_request() {
_has_bits_[0] &= ~0x00000004u;
}
inline void ClientMessage::clear_collection_request() {
if (collection_request_ != NULL) collection_request_->::CollectionRequest::Clear();
clear_has_collection_request();
inline void ClientMessage::clear_audio_collection_request() {
if (audio_collection_request_ != NULL) audio_collection_request_->::Remote::AudioCollectionRequest::Clear();
clear_has_audio_collection_request();
}
inline const ::CollectionRequest& ClientMessage::collection_request() const {
return collection_request_ != NULL ? *collection_request_ : *default_instance_->collection_request_;
inline const ::Remote::AudioCollectionRequest& ClientMessage::audio_collection_request() const {
return audio_collection_request_ != NULL ? *audio_collection_request_ : *default_instance_->audio_collection_request_;
}
inline ::CollectionRequest* ClientMessage::mutable_collection_request() {
set_has_collection_request();
if (collection_request_ == NULL) collection_request_ = new ::CollectionRequest;
return collection_request_;
inline ::Remote::AudioCollectionRequest* ClientMessage::mutable_audio_collection_request() {
set_has_audio_collection_request();
if (audio_collection_request_ == NULL) audio_collection_request_ = new ::Remote::AudioCollectionRequest;
return audio_collection_request_;
}
inline ::CollectionRequest* ClientMessage::release_collection_request() {
clear_has_collection_request();
::CollectionRequest* temp = collection_request_;
collection_request_ = NULL;
inline ::Remote::AudioCollectionRequest* ClientMessage::release_audio_collection_request() {
clear_has_audio_collection_request();
::Remote::AudioCollectionRequest* temp = audio_collection_request_;
audio_collection_request_ = NULL;
return temp;
}
inline void ClientMessage::set_allocated_collection_request(::CollectionRequest* collection_request) {
delete collection_request_;
collection_request_ = collection_request;
if (collection_request) {
set_has_collection_request();
inline void ClientMessage::set_allocated_audio_collection_request(::Remote::AudioCollectionRequest* audio_collection_request) {
delete audio_collection_request_;
audio_collection_request_ = audio_collection_request;
if (audio_collection_request) {
set_has_audio_collection_request();
} else {
clear_has_collection_request();
clear_has_audio_collection_request();
}
}
// optional .MediaRequest media_request = 4;
// optional .Remote.MediaRequest media_request = 4;
inline bool ClientMessage::has_media_request() const {
return (_has_bits_[0] & 0x00000008u) != 0;
}
@@ -482,24 +484,24 @@ inline void ClientMessage::clear_has_media_request() {
_has_bits_[0] &= ~0x00000008u;
}
inline void ClientMessage::clear_media_request() {
if (media_request_ != NULL) media_request_->::MediaRequest::Clear();
if (media_request_ != NULL) media_request_->::Remote::MediaRequest::Clear();
clear_has_media_request();
}
inline const ::MediaRequest& ClientMessage::media_request() const {
inline const ::Remote::MediaRequest& ClientMessage::media_request() const {
return media_request_ != NULL ? *media_request_ : *default_instance_->media_request_;
}
inline ::MediaRequest* ClientMessage::mutable_media_request() {
inline ::Remote::MediaRequest* ClientMessage::mutable_media_request() {
set_has_media_request();
if (media_request_ == NULL) media_request_ = new ::MediaRequest;
if (media_request_ == NULL) media_request_ = new ::Remote::MediaRequest;
return media_request_;
}
inline ::MediaRequest* ClientMessage::release_media_request() {
inline ::Remote::MediaRequest* ClientMessage::release_media_request() {
clear_has_media_request();
::MediaRequest* temp = media_request_;
::Remote::MediaRequest* temp = media_request_;
media_request_ = NULL;
return temp;
}
inline void ClientMessage::set_allocated_media_request(::MediaRequest* media_request) {
inline void ClientMessage::set_allocated_media_request(::Remote::MediaRequest* media_request) {
delete media_request_;
media_request_ = media_request;
if (media_request) {
@@ -513,7 +515,7 @@ inline void ClientMessage::set_allocated_media_request(::MediaRequest* media_req
// ServerMessage
// required .ServerMessage.Type type = 1;
// required .Remote.ServerMessage.Type type = 1;
inline bool ServerMessage::has_type() const {
return (_has_bits_[0] & 0x00000001u) != 0;
}
@@ -527,16 +529,16 @@ inline void ServerMessage::clear_type() {
type_ = 1;
clear_has_type();
}
inline ::ServerMessage_Type ServerMessage::type() const {
return static_cast< ::ServerMessage_Type >(type_);
inline ::Remote::ServerMessage_Type ServerMessage::type() const {
return static_cast< ::Remote::ServerMessage_Type >(type_);
}
inline void ServerMessage::set_type(::ServerMessage_Type value) {
assert(::ServerMessage_Type_IsValid(value));
inline void ServerMessage::set_type(::Remote::ServerMessage_Type value) {
assert(::Remote::ServerMessage_Type_IsValid(value));
set_has_type();
type_ = value;
}
// optional .AuthResponse auth_response = 2;
// optional .Remote.AuthResponse auth_response = 2;
inline bool ServerMessage::has_auth_response() const {
return (_has_bits_[0] & 0x00000002u) != 0;
}
@@ -547,24 +549,24 @@ inline void ServerMessage::clear_has_auth_response() {
_has_bits_[0] &= ~0x00000002u;
}
inline void ServerMessage::clear_auth_response() {
if (auth_response_ != NULL) auth_response_->::AuthResponse::Clear();
if (auth_response_ != NULL) auth_response_->::Remote::AuthResponse::Clear();
clear_has_auth_response();
}
inline const ::AuthResponse& ServerMessage::auth_response() const {
inline const ::Remote::AuthResponse& ServerMessage::auth_response() const {
return auth_response_ != NULL ? *auth_response_ : *default_instance_->auth_response_;
}
inline ::AuthResponse* ServerMessage::mutable_auth_response() {
inline ::Remote::AuthResponse* ServerMessage::mutable_auth_response() {
set_has_auth_response();
if (auth_response_ == NULL) auth_response_ = new ::AuthResponse;
if (auth_response_ == NULL) auth_response_ = new ::Remote::AuthResponse;
return auth_response_;
}
inline ::AuthResponse* ServerMessage::release_auth_response() {
inline ::Remote::AuthResponse* ServerMessage::release_auth_response() {
clear_has_auth_response();
::AuthResponse* temp = auth_response_;
::Remote::AuthResponse* temp = auth_response_;
auth_response_ = NULL;
return temp;
}
inline void ServerMessage::set_allocated_auth_response(::AuthResponse* auth_response) {
inline void ServerMessage::set_allocated_auth_response(::Remote::AuthResponse* auth_response) {
delete auth_response_;
auth_response_ = auth_response;
if (auth_response) {
@@ -574,45 +576,45 @@ inline void ServerMessage::set_allocated_auth_response(::AuthResponse* auth_resp
}
}
// optional .CollectionResponse collection_response = 3;
inline bool ServerMessage::has_collection_response() const {
// optional .Remote.AudioCollectionResponse audio_collection_response = 3;
inline bool ServerMessage::has_audio_collection_response() const {
return (_has_bits_[0] & 0x00000004u) != 0;
}
inline void ServerMessage::set_has_collection_response() {
inline void ServerMessage::set_has_audio_collection_response() {
_has_bits_[0] |= 0x00000004u;
}
inline void ServerMessage::clear_has_collection_response() {
inline void ServerMessage::clear_has_audio_collection_response() {
_has_bits_[0] &= ~0x00000004u;
}
inline void ServerMessage::clear_collection_response() {
if (collection_response_ != NULL) collection_response_->::CollectionResponse::Clear();
clear_has_collection_response();
inline void ServerMessage::clear_audio_collection_response() {
if (audio_collection_response_ != NULL) audio_collection_response_->::Remote::AudioCollectionResponse::Clear();
clear_has_audio_collection_response();
}
inline const ::CollectionResponse& ServerMessage::collection_response() const {
return collection_response_ != NULL ? *collection_response_ : *default_instance_->collection_response_;
inline const ::Remote::AudioCollectionResponse& ServerMessage::audio_collection_response() const {
return audio_collection_response_ != NULL ? *audio_collection_response_ : *default_instance_->audio_collection_response_;
}
inline ::CollectionResponse* ServerMessage::mutable_collection_response() {
set_has_collection_response();
if (collection_response_ == NULL) collection_response_ = new ::CollectionResponse;
return collection_response_;
inline ::Remote::AudioCollectionResponse* ServerMessage::mutable_audio_collection_response() {
set_has_audio_collection_response();
if (audio_collection_response_ == NULL) audio_collection_response_ = new ::Remote::AudioCollectionResponse;
return audio_collection_response_;
}
inline ::CollectionResponse* ServerMessage::release_collection_response() {
clear_has_collection_response();
::CollectionResponse* temp = collection_response_;
collection_response_ = NULL;
inline ::Remote::AudioCollectionResponse* ServerMessage::release_audio_collection_response() {
clear_has_audio_collection_response();
::Remote::AudioCollectionResponse* temp = audio_collection_response_;
audio_collection_response_ = NULL;
return temp;
}
inline void ServerMessage::set_allocated_collection_response(::CollectionResponse* collection_response) {
delete collection_response_;
collection_response_ = collection_response;
if (collection_response) {
set_has_collection_response();
inline void ServerMessage::set_allocated_audio_collection_response(::Remote::AudioCollectionResponse* audio_collection_response) {
delete audio_collection_response_;
audio_collection_response_ = audio_collection_response;
if (audio_collection_response) {
set_has_audio_collection_response();
} else {
clear_has_collection_response();
clear_has_audio_collection_response();
}
}
// optional .MediaResponse media_response = 4;
// optional .Remote.MediaResponse media_response = 4;
inline bool ServerMessage::has_media_response() const {
return (_has_bits_[0] & 0x00000008u) != 0;
}
@@ -623,24 +625,24 @@ inline void ServerMessage::clear_has_media_response() {
_has_bits_[0] &= ~0x00000008u;
}
inline void ServerMessage::clear_media_response() {
if (media_response_ != NULL) media_response_->::MediaResponse::Clear();
if (media_response_ != NULL) media_response_->::Remote::MediaResponse::Clear();
clear_has_media_response();
}
inline const ::MediaResponse& ServerMessage::media_response() const {
inline const ::Remote::MediaResponse& ServerMessage::media_response() const {
return media_response_ != NULL ? *media_response_ : *default_instance_->media_response_;
}
inline ::MediaResponse* ServerMessage::mutable_media_response() {
inline ::Remote::MediaResponse* ServerMessage::mutable_media_response() {
set_has_media_response();
if (media_response_ == NULL) media_response_ = new ::MediaResponse;
if (media_response_ == NULL) media_response_ = new ::Remote::MediaResponse;
return media_response_;
}
inline ::MediaResponse* ServerMessage::release_media_response() {
inline ::Remote::MediaResponse* ServerMessage::release_media_response() {
clear_has_media_response();
::MediaResponse* temp = media_response_;
::Remote::MediaResponse* temp = media_response_;
media_response_ = NULL;
return temp;
}
inline void ServerMessage::set_allocated_media_response(::MediaResponse* media_response) {
inline void ServerMessage::set_allocated_media_response(::Remote::MediaResponse* media_response) {
delete media_response_;
media_response_ = media_response;
if (media_response) {
@@ -653,17 +655,19 @@ inline void ServerMessage::set_allocated_media_response(::MediaResponse* media_r
// @@protoc_insertion_point(namespace_scope)
} // namespace Remote
#ifndef SWIG
namespace google {
namespace protobuf {
template <>
inline const EnumDescriptor* GetEnumDescriptor< ::ClientMessage_Type>() {
return ::ClientMessage_Type_descriptor();
inline const EnumDescriptor* GetEnumDescriptor< ::Remote::ClientMessage_Type>() {
return ::Remote::ClientMessage_Type_descriptor();
}
template <>
inline const EnumDescriptor* GetEnumDescriptor< ::ServerMessage_Type>() {
return ::ServerMessage_Type_descriptor();
inline const EnumDescriptor* GetEnumDescriptor< ::Remote::ServerMessage_Type>() {
return ::Remote::ServerMessage_Type_descriptor();
}
} // namespace google
remote/proto/auth.proto
+2
View File
@@ -1,5 +1,7 @@
import "common.proto";
package Remote;
message AuthRequest
{
required string user_name = 1;
remote/proto/collection.proto
+76 -73
View File
@@ -1,6 +1,8 @@
import "common.proto";
message CollectionRequest
package Remote;
message AudioCollectionRequest
{
message GetGenreList
@@ -61,8 +63,80 @@ message CollectionRequest
}
message CollectionResponse
message AudioCollectionResponse
{
message GenreList
{
required bool last = 1; // More messages follow if last = 0
repeated Genre genres = 2;
}
message ArtistList
{
required bool last = 1; // More messages follow if last = 0
repeated Artist artists = 2;
}
message ReleaseList
{
required bool last = 1; // More messages follow if last = 0
repeated Release releases = 2;
}
message TrackList
{
required bool last = 1; // More messages follow if last = 0
repeated Track tracks = 2;
}
message Genre
{
required string name = 1;
}
message CoverArt
{
optional string mime_type = 1;
repeated bytes data = 2;
}
message Artist
{
required string name = 1;
required uint32 nb_releases = 2;
}
message Release
{
required string name = 1;
required uint32 nb_tracks = 2;
required uint32 duration_secs = 3;
optional CoverArt coverArt = 4;
}
message Track
{
required int64 media_id = 1;
optional uint32 disc_number = 2;
optional uint32 track_number = 3;
optional string artist = 4;
optional string release = 5;
required string name = 6;
required uint32 duration_secs = 7;
optional string release_date = 8;
optional string original_release_date = 9;
repeated string genres = 10;
optional bytes coverArt = 11;
}
enum Type {
TypeGenreList = 1;
TypeArtistList = 2;
@@ -80,77 +154,6 @@ message CollectionResponse
optional TrackList track_list = 6;
}
message GenreList
{
required bool last = 1; // More messages follow if last = 0
repeated Genre genres = 2;
}
message ArtistList
{
required bool last = 1; // More messages follow if last = 0
repeated Artist artists = 2;
}
message ReleaseList
{
required bool last = 1; // More messages follow if last = 0
repeated Release releases = 2;
}
message TrackList
{
required bool last = 1; // More messages follow if last = 0
repeated Track tracks = 2;
}
message Genre
{
required string name = 1;
}
message CoverArt
{
optional string mime_type = 1;
repeated bytes data = 2;
}
message Artist
{
required string name = 1;
required uint32 nb_releases = 2;
}
message Release
{
required string name = 1;
required uint32 nb_tracks = 2;
required uint32 duration_secs = 3;
optional CoverArt coverArt = 4;
}
message Track
{
required int64 media_id = 1;
optional uint32 disc_number = 2;
optional uint32 track_number = 3;
optional string artist = 4;
optional string release = 5;
required string name = 6;
required uint32 duration_secs = 7;
optional string release_date = 8;
optional string original_release_date = 9;
repeated string genres = 10;
optional bytes coverArt = 11;
}
remote/proto/common.proto
+2
View File
@@ -1,4 +1,6 @@
package Remote;
message Error
{
required bool error = 1;
remote/proto/media.proto
+2
View File
@@ -1,5 +1,7 @@
import "common.proto";
package Remote;
enum CodecType
{
CodecTypeOGG = 1;
remote/proto/messages.proto
+10 -8
View File
@@ -3,20 +3,22 @@ import "auth.proto";
import "collection.proto";
import "media.proto";
package Remote;
message ClientMessage
{
enum Type
{
AuthRequest = 1;
CollectionRequest = 2;
AudioCollectionRequest = 2;
MediaRequest = 3;
}
required Type type = 1;
optional AuthRequest auth_request = 2;
optional CollectionRequest collection_request = 3;
optional MediaRequest media_request = 4;
optional AuthRequest auth_request = 2;
optional AudioCollectionRequest audio_collection_request = 3;
optional MediaRequest media_request = 4;
}
@@ -25,15 +27,15 @@ message ServerMessage
enum Type
{
AuthResponse = 1;
CollectionResponse = 2;
AduioCollectionResponse = 2;
MediaResponse = 3;
}
required Type type = 1;
optional AuthResponse auth_response = 2;
optional CollectionResponse collection_response = 3;
optional MediaResponse media_response = 4;
optional AuthResponse auth_response = 2;
optional AudioCollectionResponse audio_collection_response = 3;
optional MediaResponse media_response = 4;
}
test/Makefile.am
+5
View File
@@ -10,6 +10,11 @@ remote_SOURCES = \
$(top_srcdir)/remote/server/RequestHandler.cpp \
$(top_srcdir)/remote/server/ConnectionManager.cpp \
$(top_srcdir)/remote/server/Connection.cpp \
$(top_srcdir)/remote/messages/auth.pb.cc \
$(top_srcdir)/remote/messages/collection.pb.cc \
$(top_srcdir)/remote/messages/common.pb.cc \
$(top_srcdir)/remote/messages/media.pb.cc \
$(top_srcdir)/remote/messages/messages.pb.cc \
$(top_srcdir)/database/Artist.cpp \
$(top_srcdir)/database/Genre.cpp \
$(top_srcdir)/database/Release.cpp \
test/Makefile.in
+104 -7
View File
@@ -121,10 +121,13 @@ am_remote_OBJECTS = remote-RemoteClientServer.$(OBJEXT) \
remote-TestDatabase.$(OBJEXT) remote-Server.$(OBJEXT) \
remote-RequestHandler.$(OBJEXT) \
remote-ConnectionManager.$(OBJEXT) remote-Connection.$(OBJEXT) \
remote-Artist.$(OBJEXT) remote-Genre.$(OBJEXT) \
remote-Release.$(OBJEXT) remote-Track.$(OBJEXT) \
remote-DatabaseHandler.$(OBJEXT) remote-Path.$(OBJEXT) \
remote-Video.$(OBJEXT) remote-Checksum.$(OBJEXT)
remote-auth.pb.$(OBJEXT) remote-collection.pb.$(OBJEXT) \
remote-common.pb.$(OBJEXT) remote-media.pb.$(OBJEXT) \
remote-messages.pb.$(OBJEXT) remote-Artist.$(OBJEXT) \
remote-Genre.$(OBJEXT) remote-Release.$(OBJEXT) \
remote-Track.$(OBJEXT) remote-DatabaseHandler.$(OBJEXT) \
remote-Path.$(OBJEXT) remote-Video.$(OBJEXT) \
remote-Checksum.$(OBJEXT)
remote_OBJECTS = $(am_remote_OBJECTS)
remote_LDADD = $(LDADD)
remote_LINK = $(CXXLD) $(remote_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
@@ -496,6 +499,11 @@ remote_SOURCES = \
$(top_srcdir)/remote/server/RequestHandler.cpp \
$(top_srcdir)/remote/server/ConnectionManager.cpp \
$(top_srcdir)/remote/server/Connection.cpp \
$(top_srcdir)/remote/messages/auth.pb.cc \
$(top_srcdir)/remote/messages/collection.pb.cc \
$(top_srcdir)/remote/messages/common.pb.cc \
$(top_srcdir)/remote/messages/media.pb.cc \
$(top_srcdir)/remote/messages/messages.pb.cc \
$(top_srcdir)/database/Artist.cpp \
$(top_srcdir)/database/Genre.cpp \
$(top_srcdir)/database/Release.cpp \
@@ -538,7 +546,7 @@ sql_query_CXXFLAGS = -std=c++11 -Wall -Wextra -I$(top_srcdir)
all: all-am
.SUFFIXES:
.SUFFIXES: .cpp .log .o .obj .test .test$(EXEEXT) .trs
.SUFFIXES: .cc .cpp .log .o .obj .test .test$(EXEEXT) .trs
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -627,17 +635,22 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-TestDatabase.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-Track.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-Video.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-auth.pb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-collection.pb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-common.pb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-media.pb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-messages.pb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sql_query-CheckSqlQuery.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sql_query-SqlQuery.Po@am__quote@
.cpp.o:
.cc.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cpp.obj:
.cc.obj:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -980,6 +993,76 @@ remote-Connection.obj: $(top_srcdir)/remote/server/Connection.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -c -o remote-Connection.obj `if test -f '$(top_srcdir)/remote/server/Connection.cpp'; then $(CYGPATH_W) '$(top_srcdir)/remote/server/Connection.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/remote/server/Connection.cpp'; fi`
remote-auth.pb.o: $(top_srcdir)/remote/messages/auth.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -MT remote-auth.pb.o -MD -MP -MF $(DEPDIR)/remote-auth.pb.Tpo -c -o remote-auth.pb.o `test -f '$(top_srcdir)/remote/messages/auth.pb.cc' || echo '$(srcdir)/'`$(top_srcdir)/remote/messages/auth.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote-auth.pb.Tpo $(DEPDIR)/remote-auth.pb.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/remote/messages/auth.pb.cc' object='remote-auth.pb.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -c -o remote-auth.pb.o `test -f '$(top_srcdir)/remote/messages/auth.pb.cc' || echo '$(srcdir)/'`$(top_srcdir)/remote/messages/auth.pb.cc
remote-auth.pb.obj: $(top_srcdir)/remote/messages/auth.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -MT remote-auth.pb.obj -MD -MP -MF $(DEPDIR)/remote-auth.pb.Tpo -c -o remote-auth.pb.obj `if test -f '$(top_srcdir)/remote/messages/auth.pb.cc'; then $(CYGPATH_W) '$(top_srcdir)/remote/messages/auth.pb.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/remote/messages/auth.pb.cc'; fi`
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote-auth.pb.Tpo $(DEPDIR)/remote-auth.pb.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/remote/messages/auth.pb.cc' object='remote-auth.pb.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -c -o remote-auth.pb.obj `if test -f '$(top_srcdir)/remote/messages/auth.pb.cc'; then $(CYGPATH_W) '$(top_srcdir)/remote/messages/auth.pb.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/remote/messages/auth.pb.cc'; fi`
remote-collection.pb.o: $(top_srcdir)/remote/messages/collection.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -MT remote-collection.pb.o -MD -MP -MF $(DEPDIR)/remote-collection.pb.Tpo -c -o remote-collection.pb.o `test -f '$(top_srcdir)/remote/messages/collection.pb.cc' || echo '$(srcdir)/'`$(top_srcdir)/remote/messages/collection.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote-collection.pb.Tpo $(DEPDIR)/remote-collection.pb.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/remote/messages/collection.pb.cc' object='remote-collection.pb.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -c -o remote-collection.pb.o `test -f '$(top_srcdir)/remote/messages/collection.pb.cc' || echo '$(srcdir)/'`$(top_srcdir)/remote/messages/collection.pb.cc
remote-collection.pb.obj: $(top_srcdir)/remote/messages/collection.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -MT remote-collection.pb.obj -MD -MP -MF $(DEPDIR)/remote-collection.pb.Tpo -c -o remote-collection.pb.obj `if test -f '$(top_srcdir)/remote/messages/collection.pb.cc'; then $(CYGPATH_W) '$(top_srcdir)/remote/messages/collection.pb.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/remote/messages/collection.pb.cc'; fi`
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote-collection.pb.Tpo $(DEPDIR)/remote-collection.pb.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/remote/messages/collection.pb.cc' object='remote-collection.pb.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -c -o remote-collection.pb.obj `if test -f '$(top_srcdir)/remote/messages/collection.pb.cc'; then $(CYGPATH_W) '$(top_srcdir)/remote/messages/collection.pb.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/remote/messages/collection.pb.cc'; fi`
remote-common.pb.o: $(top_srcdir)/remote/messages/common.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -MT remote-common.pb.o -MD -MP -MF $(DEPDIR)/remote-common.pb.Tpo -c -o remote-common.pb.o `test -f '$(top_srcdir)/remote/messages/common.pb.cc' || echo '$(srcdir)/'`$(top_srcdir)/remote/messages/common.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote-common.pb.Tpo $(DEPDIR)/remote-common.pb.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/remote/messages/common.pb.cc' object='remote-common.pb.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -c -o remote-common.pb.o `test -f '$(top_srcdir)/remote/messages/common.pb.cc' || echo '$(srcdir)/'`$(top_srcdir)/remote/messages/common.pb.cc
remote-common.pb.obj: $(top_srcdir)/remote/messages/common.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -MT remote-common.pb.obj -MD -MP -MF $(DEPDIR)/remote-common.pb.Tpo -c -o remote-common.pb.obj `if test -f '$(top_srcdir)/remote/messages/common.pb.cc'; then $(CYGPATH_W) '$(top_srcdir)/remote/messages/common.pb.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/remote/messages/common.pb.cc'; fi`
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote-common.pb.Tpo $(DEPDIR)/remote-common.pb.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/remote/messages/common.pb.cc' object='remote-common.pb.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -c -o remote-common.pb.obj `if test -f '$(top_srcdir)/remote/messages/common.pb.cc'; then $(CYGPATH_W) '$(top_srcdir)/remote/messages/common.pb.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/remote/messages/common.pb.cc'; fi`
remote-media.pb.o: $(top_srcdir)/remote/messages/media.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -MT remote-media.pb.o -MD -MP -MF $(DEPDIR)/remote-media.pb.Tpo -c -o remote-media.pb.o `test -f '$(top_srcdir)/remote/messages/media.pb.cc' || echo '$(srcdir)/'`$(top_srcdir)/remote/messages/media.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote-media.pb.Tpo $(DEPDIR)/remote-media.pb.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/remote/messages/media.pb.cc' object='remote-media.pb.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -c -o remote-media.pb.o `test -f '$(top_srcdir)/remote/messages/media.pb.cc' || echo '$(srcdir)/'`$(top_srcdir)/remote/messages/media.pb.cc
remote-media.pb.obj: $(top_srcdir)/remote/messages/media.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -MT remote-media.pb.obj -MD -MP -MF $(DEPDIR)/remote-media.pb.Tpo -c -o remote-media.pb.obj `if test -f '$(top_srcdir)/remote/messages/media.pb.cc'; then $(CYGPATH_W) '$(top_srcdir)/remote/messages/media.pb.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/remote/messages/media.pb.cc'; fi`
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote-media.pb.Tpo $(DEPDIR)/remote-media.pb.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/remote/messages/media.pb.cc' object='remote-media.pb.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -c -o remote-media.pb.obj `if test -f '$(top_srcdir)/remote/messages/media.pb.cc'; then $(CYGPATH_W) '$(top_srcdir)/remote/messages/media.pb.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/remote/messages/media.pb.cc'; fi`
remote-messages.pb.o: $(top_srcdir)/remote/messages/messages.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -MT remote-messages.pb.o -MD -MP -MF $(DEPDIR)/remote-messages.pb.Tpo -c -o remote-messages.pb.o `test -f '$(top_srcdir)/remote/messages/messages.pb.cc' || echo '$(srcdir)/'`$(top_srcdir)/remote/messages/messages.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote-messages.pb.Tpo $(DEPDIR)/remote-messages.pb.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/remote/messages/messages.pb.cc' object='remote-messages.pb.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -c -o remote-messages.pb.o `test -f '$(top_srcdir)/remote/messages/messages.pb.cc' || echo '$(srcdir)/'`$(top_srcdir)/remote/messages/messages.pb.cc
remote-messages.pb.obj: $(top_srcdir)/remote/messages/messages.pb.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -MT remote-messages.pb.obj -MD -MP -MF $(DEPDIR)/remote-messages.pb.Tpo -c -o remote-messages.pb.obj `if test -f '$(top_srcdir)/remote/messages/messages.pb.cc'; then $(CYGPATH_W) '$(top_srcdir)/remote/messages/messages.pb.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/remote/messages/messages.pb.cc'; fi`
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote-messages.pb.Tpo $(DEPDIR)/remote-messages.pb.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(top_srcdir)/remote/messages/messages.pb.cc' object='remote-messages.pb.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -c -o remote-messages.pb.obj `if test -f '$(top_srcdir)/remote/messages/messages.pb.cc'; then $(CYGPATH_W) '$(top_srcdir)/remote/messages/messages.pb.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/remote/messages/messages.pb.cc'; fi`
remote-Artist.o: $(top_srcdir)/database/Artist.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_CXXFLAGS) $(CXXFLAGS) -MT remote-Artist.o -MD -MP -MF $(DEPDIR)/remote-Artist.Tpo -c -o remote-Artist.o `test -f '$(top_srcdir)/database/Artist.cpp' || echo '$(srcdir)/'`$(top_srcdir)/database/Artist.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote-Artist.Tpo $(DEPDIR)/remote-Artist.Po
@@ -1120,6 +1203,20 @@ sql_query-SqlQuery.obj: $(top_srcdir)/database/SqlQuery.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sql_query_CXXFLAGS) $(CXXFLAGS) -c -o sql_query-SqlQuery.obj `if test -f '$(top_srcdir)/database/SqlQuery.cpp'; then $(CYGPATH_W) '$(top_srcdir)/database/SqlQuery.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/database/SqlQuery.cpp'; fi`
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cpp.obj:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
ID: $(am__tagged_files)
$(am__define_uniq_tagged_files); mkid -fID $$unique
tags: tags-am
test/RemoteClientServer.cpp
+75 -3
View File
@@ -6,12 +6,12 @@
#include <boost/asio.hpp>
#include "remote/server/Server.hpp"
#include "remote/messages/Header.hpp"
#include "remote/messages/messages.pb.h"
#include "TestDatabase.hpp"
// Ugly class for testing purposes
class TestServer
{
@@ -54,12 +54,83 @@ class TestClient
_socket.connect(endpoint);
}
void getArtists(std::vector<std::string>& artists)
{
}
private:
void sendMsg(const ::google::protobuf::Message& message)
{
// Serialize message
std::string outputStr;
if (message.SerializeToString(&outputStr))
{
// Send message header
std::array<unsigned char, Remote::Header::size> headerBuffer;
// Generate header content
{
Remote::Header header;
header.setSize(outputStr.size());
header.to_buffer(headerBuffer);
}
boost::asio::write(_socket, boost::asio::buffer(headerBuffer));
// Send serialized message
boost::asio::write(_socket, boost::asio::buffer(outputStr));
}
else
{
std::cerr << "Cannot serialize message!" << std::endl;
throw std::runtime_error("message.SerializeToString failed!");
}
}
void recvMsg(::google::protobuf::Message& message)
{
boost::asio::streambuf messageStreamBuffer;
std::istream responseStream(&response);
boost::asio::read(_socket,
messageStreamBuffer,
boost::asio::transfer_exactly(Remote::Header::size));
bool error;
Remote::Header header (Remote::Header::from_buffer(headerBuffer, error));
if (error)
throw std::runtime_error("Cannot read header from buffer!");
if (header.getSize() > _inputBuffer.size())
throw std::runtime_error("Input buffer too small!");
// Read in a stream buffer
{
boost::asio::streambuf response;
boost::asio::read(_socket,
response,
boost::asio::transfer_exactly(header.getSize()));
if (!message.ParseFromIstream(&responseStream))
throw std::runtime_error("message.ParseFromIstream failed!");
}
}
boost::asio::io_service _ioService;
boost::asio::ip::tcp::socket _socket;
boost::streambuf _inputStreamBuf;
std::array<unsigned char, 65536> _inputBuffer;
};
@@ -76,7 +147,8 @@ int main(int argc, char* argv[])
TestClient client( boost::asio::ip::tcp::endpoint( boost::asio::ip::address_v4::loopback(), 5080));
// TODO get some data
std::vector<std::string> artists;
client.getArtists(artists);
testServer.stop();