dbus changes: add SetGlobalOutputChannelRemix support

dbus/message.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "dbus/message.h"
 
 #include <string>
 
 #include "base/format_macros.h"
 #include "base/logging.h"
@@ skipping 581 matching lines @@
   OpenArray("y", &array_writer);
   const bool success = dbus_message_iter_append_fixed_array(
       &(array_writer.raw_message_iter_),
       DBUS_TYPE_BYTE,
       &values,
       static_cast<int>(length));
   CHECK(success) << "Unable to allocate memory";
   CloseContainer(&array_writer);
 }
 
+void MessageWriter::AppendArrayOfDoubles(const double* values, size_t length) {
+  DCHECK(!container_is_open_);
+  MessageWriter array_writer(message_);
+  OpenArray("d", &array_writer);
+  const bool success = dbus_message_iter_append_fixed_array(
+      &(array_writer.raw_message_iter_),
+      DBUS_TYPE_DOUBLE,
+      &values,
+      static_cast<int>(length));
+  CHECK(success) << "Unable to allocate memory";
+  CloseContainer(&array_writer);
+}
+
 void MessageWriter::AppendArrayOfStrings(
     const std::vector<std::string>& strings) {
   DCHECK(!container_is_open_);
   MessageWriter array_writer(message_);
   OpenArray("s", &array_writer);
   for (size_t i = 0; i < strings.size(); ++i) {
     array_writer.AppendString(strings[i]);
   }
   CloseContainer(&array_writer);
 }
@@ skipping 207 matching lines @@
   if (!array_reader.CheckDataType(DBUS_TYPE_BYTE))
     return false;
   int int_length = 0;
   dbus_message_iter_get_fixed_array(&array_reader.raw_message_iter_,
                                     bytes,
                                     &int_length);
   *length = static_cast<int>(int_length);
   return true;
 }
 
+bool MessageReader::PopArrayOfDoubles(const double** doubles, size_t* length) {
+  MessageReader array_reader(message_);
+  if (!PopArray(&array_reader))
+    return false;
+  if (!array_reader.HasMoreData()) {
+    *length = 0;
+    *doubles = nullptr;
+    return true;
+  }
+  if (!array_reader.CheckDataType(DBUS_TYPE_DOUBLE))
+    return false;
+  int int_length = 0;
+  dbus_message_iter_get_fixed_array(&array_reader.raw_message_iter_,
+                                    doubles,
+                                    &int_length);
+  *length = static_cast<int>(int_length);

[stevenjb, 2016/03/29 18:38:03]

static_cast<size_t> ?

[Qiang(Joe) Xu, 2016/03/29 19:19:09]

Done.

+  return true;
+}
+
 bool MessageReader::PopArrayOfStrings(
     std::vector<std::string> *strings) {
   strings->clear();
   MessageReader array_reader(message_);
   if (!PopArray(&array_reader))
     return false;
   while (array_reader.HasMoreData()) {
     std::string string;
     if (!array_reader.PopString(&string))
       return false;
@@ skipping 152 matching lines @@
   const bool success = PopBasic(DBUS_TYPE_UNIX_FD, &fd);
   if (!success)
     return false;
 
   value->PutValue(fd);
   // NB: the caller must check validity before using the value
   return true;
 }
 
 }  // namespace dbus