Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: media/midi/midi_manager_usb.cc

Issue 2891683002: Remove ScopedVector from all other codes in media/ (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/midi/midi_manager_usb.h" 5 #include "media/midi/midi_manager_usb.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 // |port_index| is provided by a renderer so we can't believe that it is 60 // |port_index| is provided by a renderer so we can't believe that it is
61 // in the valid range. 61 // in the valid range.
62 return; 62 return;
63 } 63 }
64 // output_streams_[port_index] is alive unless MidiManagerUsb is deleted. 64 // output_streams_[port_index] is alive unless MidiManagerUsb is deleted.
65 // The task posted to the MidiScheduler will be disposed safely on deleting 65 // The task posted to the MidiScheduler will be disposed safely on deleting
66 // the scheduler. 66 // the scheduler.
67 scheduler_->PostSendDataTask( 67 scheduler_->PostSendDataTask(
68 client, data.size(), timestamp, 68 client, data.size(), timestamp,
69 base::Bind(&UsbMidiOutputStream::Send, 69 base::Bind(&UsbMidiOutputStream::Send,
70 base::Unretained(output_streams_[port_index]), data)); 70 base::Unretained(output_streams_[port_index].get()), data));
71 } 71 }
72 72
73 void MidiManagerUsb::ReceiveUsbMidiData(UsbMidiDevice* device, 73 void MidiManagerUsb::ReceiveUsbMidiData(UsbMidiDevice* device,
74 int endpoint_number, 74 int endpoint_number,
75 const uint8_t* data, 75 const uint8_t* data,
76 size_t size, 76 size_t size,
77 base::TimeTicks time) { 77 base::TimeTicks time) {
78 if (!input_stream_) 78 if (!input_stream_)
79 return; 79 return;
80 input_stream_->OnReceivedData(device, 80 input_stream_->OnReceivedData(device,
81 endpoint_number, 81 endpoint_number,
82 data, 82 data,
83 size, 83 size,
84 time); 84 time);
85 } 85 }
86 86
87 void MidiManagerUsb::OnDeviceAttached(std::unique_ptr<UsbMidiDevice> device) { 87 void MidiManagerUsb::OnDeviceAttached(std::unique_ptr<UsbMidiDevice> device) {
88 int device_id = static_cast<int>(devices_.size()); 88 int device_id = static_cast<int>(devices_.size());
89 devices_.push_back(std::move(device)); 89 devices_.push_back(std::move(device));
90 AddPorts(devices_.back(), device_id); 90 AddPorts(devices_.back().get(), device_id);
91 } 91 }
92 92
93 void MidiManagerUsb::OnDeviceDetached(size_t index) { 93 void MidiManagerUsb::OnDeviceDetached(size_t index) {
94 if (index >= devices_.size()) { 94 if (index >= devices_.size()) {
95 return; 95 return;
96 } 96 }
97 UsbMidiDevice* device = devices_[index]; 97 UsbMidiDevice* device = devices_[index].get();
98 for (size_t i = 0; i < output_streams_.size(); ++i) { 98 for (size_t i = 0; i < output_streams_.size(); ++i) {
99 if (output_streams_[i]->jack().device == device) { 99 if (output_streams_[i]->jack().device == device) {
100 SetOutputPortState(static_cast<uint32_t>(i), PortState::DISCONNECTED); 100 SetOutputPortState(static_cast<uint32_t>(i), PortState::DISCONNECTED);
101 } 101 }
102 } 102 }
103 const std::vector<UsbMidiJack>& input_jacks = input_stream_->jacks(); 103 const std::vector<UsbMidiJack>& input_jacks = input_stream_->jacks();
104 for (size_t i = 0; i < input_jacks.size(); ++i) { 104 for (size_t i = 0; i < input_jacks.size(); ++i) {
105 if (input_jacks[i].device == device) { 105 if (input_jacks[i].device == device) {
106 SetInputPortState(static_cast<uint32_t>(i), PortState::DISCONNECTED); 106 SetInputPortState(static_cast<uint32_t>(i), PortState::DISCONNECTED);
107 } 107 }
(...skipping 10 matching lines...) Expand all
118 118
119 void MidiManagerUsb::OnEnumerateDevicesDone(bool result, 119 void MidiManagerUsb::OnEnumerateDevicesDone(bool result,
120 UsbMidiDevice::Devices* devices) { 120 UsbMidiDevice::Devices* devices) {
121 if (!result) { 121 if (!result) {
122 initialize_callback_.Run(Result::INITIALIZATION_ERROR); 122 initialize_callback_.Run(Result::INITIALIZATION_ERROR);
123 return; 123 return;
124 } 124 }
125 input_stream_.reset(new UsbMidiInputStream(this)); 125 input_stream_.reset(new UsbMidiInputStream(this));
126 devices->swap(devices_); 126 devices->swap(devices_);
127 for (size_t i = 0; i < devices_.size(); ++i) { 127 for (size_t i = 0; i < devices_.size(); ++i) {
128 if (!AddPorts(devices_[i], static_cast<int>(i))) { 128 if (!AddPorts(devices_[i].get(), static_cast<int>(i))) {
129 initialize_callback_.Run(Result::INITIALIZATION_ERROR); 129 initialize_callback_.Run(Result::INITIALIZATION_ERROR);
130 return; 130 return;
131 } 131 }
132 } 132 }
133 initialize_callback_.Run(Result::OK); 133 initialize_callback_.Run(Result::OK);
134 } 134 }
135 135
136 bool MidiManagerUsb::AddPorts(UsbMidiDevice* device, int device_id) { 136 bool MidiManagerUsb::AddPorts(UsbMidiDevice* device, int device_id) {
137 UsbMidiDescriptorParser parser; 137 UsbMidiDescriptorParser parser;
138 std::vector<uint8_t> descriptor = device->GetDescriptors(); 138 std::vector<uint8_t> descriptor = device->GetDescriptors();
(...skipping 10 matching lines...) Expand all
149 std::string product_name(device->GetProductName()); 149 std::string product_name(device->GetProductName());
150 std::string version(device->GetDeviceVersion()); 150 std::string version(device->GetDeviceVersion());
151 151
152 for (size_t j = 0; j < jacks.size(); ++j) { 152 for (size_t j = 0; j < jacks.size(); ++j) {
153 // Port ID must be unique in a MIDI manager. This ID setting is 153 // Port ID must be unique in a MIDI manager. This ID setting is
154 // sufficiently unique although there is no user-friendly meaning. 154 // sufficiently unique although there is no user-friendly meaning.
155 // TODO(yhirano): Use a hashed string as ID. 155 // TODO(yhirano): Use a hashed string as ID.
156 std::string id( 156 std::string id(
157 base::StringPrintf("usb:port-%d-%ld", device_id, static_cast<long>(j))); 157 base::StringPrintf("usb:port-%d-%ld", device_id, static_cast<long>(j)));
158 if (jacks[j].direction() == UsbMidiJack::DIRECTION_OUT) { 158 if (jacks[j].direction() == UsbMidiJack::DIRECTION_OUT) {
159 output_streams_.push_back(new UsbMidiOutputStream(jacks[j])); 159 output_streams_.push_back(
160 base::MakeUnique<UsbMidiOutputStream>(jacks[j]));
160 AddOutputPort(MidiPortInfo(id, manufacturer, product_name, version, 161 AddOutputPort(MidiPortInfo(id, manufacturer, product_name, version,
161 PortState::OPENED)); 162 PortState::OPENED));
162 } else { 163 } else {
163 DCHECK_EQ(jacks[j].direction(), UsbMidiJack::DIRECTION_IN); 164 DCHECK_EQ(jacks[j].direction(), UsbMidiJack::DIRECTION_IN);
164 input_stream_->Add(jacks[j]); 165 input_stream_->Add(jacks[j]);
165 AddInputPort(MidiPortInfo(id, manufacturer, product_name, version, 166 AddInputPort(MidiPortInfo(id, manufacturer, product_name, version,
166 PortState::OPENED)); 167 PortState::OPENED));
167 } 168 }
168 } 169 }
169 return true; 170 return true;
170 } 171 }
171 172
172 } // namespace midi 173 } // namespace midi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698