Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / media / midi / midi_manager_usb.cc

diff --git a/src/media/midi/midi_manager_usb.cc b/src/media/midi/midi_manager_usb.cc
index db6e1f1..fcefdf5 100644 (file)
--- a/src/media/midi/midi_manager_usb.cc
+++ b/src/media/midi/midi_manager_usb.cc
@@ -8,6 +8,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "base/strings/stringprintf.h"
 #include "media/midi/usb_midi_descriptor_parser.h"
 #include "media/midi/usb_midi_device.h"
 #include "media/midi/usb_midi_input_stream.h"
@@ -16,16 +17,6 @@
 
 namespace media {
 
-namespace {
-
-// Noop callback for (sync) Initialize.
-// TODO(yhirano): This function should go away when
-// MidiManager::Initialize() becomes asynchronous. See http://crbug.com/339746.
-void Noop(bool result) {
-}
-
-}  // namespace
-
 MidiManagerUsb::MidiManagerUsb(scoped_ptr<UsbMidiDevice::Factory> factory)
     : device_factory_(factory.Pass()) {
 }
@@ -33,12 +24,13 @@ MidiManagerUsb::MidiManagerUsb(scoped_ptr<UsbMidiDevice::Factory> factory)
 MidiManagerUsb::~MidiManagerUsb() {
 }
 
-bool MidiManagerUsb::Initialize() {
-  Initialize(base::Bind(Noop));
-  return true;
+void MidiManagerUsb::StartInitialization() {
+  Initialize(
+      base::Bind(&MidiManager::CompleteInitialization, base::Unretained(this)));
 }
 
-void MidiManagerUsb::Initialize(base::Callback<void(bool result)> callback) {
+void MidiManagerUsb::Initialize(
+    base::Callback<void(MidiResult result)> callback) {
   initialize_callback_ = callback;
   // This is safe because EnumerateDevices cancels the operation on destruction.
   device_factory_->EnumerateDevices(
@@ -60,28 +52,28 @@ void MidiManagerUsb::ReceiveUsbMidiData(UsbMidiDevice* device,
                                         int endpoint_number,
                                         const uint8* data,
                                         size_t size,
-                                        double timestamp) {
+                                        base::TimeTicks time) {
   if (!input_stream_)
     return;
   input_stream_->OnReceivedData(device,
                                 endpoint_number,
                                 data,
                                 size,
-                                timestamp);
+                                time);
 }
 
 void MidiManagerUsb::OnReceivedData(size_t jack_index,
                                     const uint8* data,
                                     size_t size,
-                                    double timestamp) {
-  ReceiveMidiData(jack_index, data, size, timestamp);
+                                    base::TimeTicks time) {
+  ReceiveMidiData(jack_index, data, size, time);
 }
 
 
 void MidiManagerUsb::OnEnumerateDevicesDone(bool result,
                                             UsbMidiDevice::Devices* devices) {
   if (!result) {
-    initialize_callback_.Run(false);
+    initialize_callback_.Run(MIDI_INITIALIZATION_ERROR);
     return;
   }
   devices->swap(devices_);
@@ -95,7 +87,7 @@ void MidiManagerUsb::OnEnumerateDevicesDone(bool result,
                                      descriptor.size(),
                                      &jacks);
     if (!parse_result) {
-      initialize_callback_.Run(false);
+      initialize_callback_.Run(MIDI_INITIALIZATION_ERROR);
       return;
     }
     std::vector<UsbMidiJack> input_jacks;
@@ -103,17 +95,29 @@ void MidiManagerUsb::OnEnumerateDevicesDone(bool result,
       if (jacks[j].direction() == UsbMidiJack::DIRECTION_OUT) {
         output_streams_.push_back(new UsbMidiOutputStream(jacks[j]));
         // TODO(yhirano): Set appropriate properties.
-        AddOutputPort(MidiPortInfo());
+        // TODO(yhiran): Port ID should contain product ID / vendor ID.
+        // Port ID must be unique in a MIDI manager. This (and the below) ID
+        // setting is sufficiently unique although there is no user-friendly
+        // meaning.
+        MidiPortInfo port;
+        port.id = base::StringPrintf("port-%ld-%ld",
+                                     static_cast<long>(i),
+                                     static_cast<long>(j));
+        AddOutputPort(port);
       } else {
         DCHECK_EQ(jacks[j].direction(), UsbMidiJack::DIRECTION_IN);
         input_jacks.push_back(jacks[j]);
         // TODO(yhirano): Set appropriate properties.
-        AddInputPort(MidiPortInfo());
+        MidiPortInfo port;
+        port.id = base::StringPrintf("port-%ld-%ld",
+                                     static_cast<long>(i),
+                                     static_cast<long>(j));
+        AddInputPort(port);
       }
     }
     input_stream_.reset(new UsbMidiInputStream(input_jacks, this));
   }
-  initialize_callback_.Run(true);
+  initialize_callback_.Run(MIDI_OK);
 }
 
 }  // namespace media