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

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

Issue 1510313002: Fix crash with MIDI send for MidiManagerAlsa (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2526
Patch Set: Created 5 years 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
« no previous file with comments | « media/midi/midi_manager.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_alsa.h" 5 #include "media/midi/midi_manager_alsa.h"
6 6
7 #include <poll.h> 7 #include <poll.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 delay = std::max(time_to_send - base::TimeTicks::Now(), base::TimeDelta()); 291 delay = std::max(time_to_send - base::TimeTicks::Now(), base::TimeDelta());
292 } 292 }
293 293
294 send_thread_.message_loop()->PostDelayedTask( 294 send_thread_.message_loop()->PostDelayedTask(
295 FROM_HERE, base::Bind(&MidiManagerAlsa::SendMidiData, 295 FROM_HERE, base::Bind(&MidiManagerAlsa::SendMidiData,
296 base::Unretained(this), port_index, data), 296 base::Unretained(this), port_index, data),
297 delay); 297 delay);
298 298
299 // Acknowledge send. 299 // Acknowledge send.
300 send_thread_.message_loop()->PostTask( 300 send_thread_.message_loop()->PostTask(
301 FROM_HERE, base::Bind(&MidiManagerClient::AccumulateMidiBytesSent, 301 FROM_HERE, base::Bind(&MidiManagerAlsa::AccumulateMidiBytesSent,
302 base::Unretained(client), data.size())); 302 base::Unretained(this), client, data.size()));
303 } 303 }
304 304
305 MidiManagerAlsa::MidiPort::Id::Id() = default; 305 MidiManagerAlsa::MidiPort::Id::Id() = default;
306 306
307 MidiManagerAlsa::MidiPort::Id::Id(const std::string& bus, 307 MidiManagerAlsa::MidiPort::Id::Id(const std::string& bus,
308 const std::string& vendor_id, 308 const std::string& vendor_id,
309 const std::string& model_id, 309 const std::string& model_id,
310 const std::string& usb_interface_num, 310 const std::string& usb_interface_num,
311 const std::string& serial) 311 const std::string& serial)
312 : bus_(bus), 312 : bus_(bus),
(...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after
1341 source_map_[AddrToInt(client_id, port_id)] = port_index; 1341 source_map_[AddrToInt(client_id, port_id)] = port_index;
1342 return true; 1342 return true;
1343 } 1343 }
1344 1344
1345 MidiManager* MidiManager::Create() { 1345 MidiManager* MidiManager::Create() {
1346 return new MidiManagerAlsa(); 1346 return new MidiManagerAlsa();
1347 } 1347 }
1348 1348
1349 } // namespace midi 1349 } // namespace midi
1350 } // namespace media 1350 } // namespace media
OLDNEW
« no previous file with comments | « media/midi/midi_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698