Web MIDI: make input_ports_ and output_ports_ members private

media/midi/midi_manager_win.cc

 // Copyright 2013 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 "media/midi/midi_manager_win.h"
 
 #include <windows.h>
 
 // Prevent unnecessary functions from being included from <mmsystem.h>
 #define MMNODRV
@@ skipping 498 matching lines @@
     }
     scoped_ptr<InDeviceInfo> in_device(InDeviceInfo::Create(this, device_id));
     if (!in_device)
       continue;
     MidiPortInfo info(
         base::IntToString(static_cast<int>(device_id)),
         "",
         base::WideToUTF8(caps.szPname),
         base::IntToString(static_cast<int>(caps.vDriverVersion)));
     AddInputPort(info);
-    in_device->set_port_index(input_ports_.size() - 1);
+    in_device->set_port_index(get_input_ports().size() - 1);
     in_devices_.push_back(in_device.Pass());
   }
 
   const UINT num_out_devices = midiOutGetNumDevs();
   out_devices_.reserve(num_out_devices);
   for (UINT device_id = 0; device_id < num_out_devices; ++device_id) {
     MIDIOUTCAPS caps = {};
     MMRESULT result = midiOutGetDevCaps(device_id, &caps, sizeof(caps));
     if (result != MMSYSERR_NOERROR) {
       DLOG(ERROR) << "Failed to obtain output device info: "
@@ skipping 11 matching lines @@
     AddOutputPort(info);
     out_devices_.push_back(out_port.Pass());
   }
 
   CompleteInitialization(MIDI_OK);
 }
 
 MidiManagerWin::~MidiManagerWin() {
   // Cleanup order is important. |send_thread_| must be stopped before
   // |out_devices_| is cleared.
-  for (size_t i = 0; i < output_ports_.size(); ++i)
+  for (size_t i = 0; i < get_output_ports().size(); ++i)
     out_devices_[i]->Quit();
   send_thread_.Stop();
 
   out_devices_.clear();
-  output_ports_.clear();
   in_devices_.clear();
-  input_ports_.clear();
+  ClearInputOutputPorts();

[Takashi Toyoshima, 2014/05/06 23:12:11]

BTW, Yukawa-san, do you remember why ports should be clear by not MidiManager
but derived win specific class?

[yukawa, 2014/05/07 00:29:57]

Hmm, I don't know. An important rule here is that we should wait for the
completion of |send_thread_| before manipulating {in/out}ports. However, I don't
know if we need to clear ports in each derived class. I think it is safe to
clear them MidiManager.

(bonus point if we put const for each field in MidiPortInfo.)

[Takashi Toyoshima, 2014/05/07 02:28:26]

OK, so I just remove it.

For making MidiPostInfoList std::vector<const MidiPortInfo>, it seems not to be
simple since IPC macros, IPC_STRUCT_TRAITS_*, use move operation for
serializing/deserializing.

 }
 
 void MidiManagerWin::DispatchSendMidiData(MidiManagerClient* client,
                                           uint32 port_index,
                                           const std::vector<uint8>& data,
                                           double timestamp) {
   if (out_devices_.size() <= port_index)
     return;
 
   base::TimeDelta delay;
@@ skipping 21 matching lines @@
       FROM_HERE,
       base::Bind(&MidiManagerClient::AccumulateMidiBytesSent,
                  base::Unretained(client), data.size()));
 }
 
 MidiManager* MidiManager::Create() {
   return new MidiManagerWin();
 }
 
 }  // namespace media