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

Unified Diff: media/midi/midi_manager_win.cc

Issue 1182913007: Merge M43: Web MIDI: disable unsupported devices on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2357
Patch Set: Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/midi/midi_manager_win.cc
diff --git a/media/midi/midi_manager_win.cc b/media/midi/midi_manager_win.cc
index 1d140c3d7a40a2b42884580a80ec64e04c5b77c4..e7cb8f33878056124af599a879aca6ca7fb706c4 100644
--- a/media/midi/midi_manager_win.cc
+++ b/media/midi/midi_manager_win.cc
@@ -305,6 +305,12 @@ std::string GetManufacturerName(const MidiDeviceInfo& info) {
}
}
+bool IsUnsupportedDevice(const MidiDeviceInfo& info) {
+ return info.manufacturer_id == MM_MICROSOFT &&
+ (info.product_id == MM_MSFT_WDMAUDIO_MIDIOUT ||
+ info.product_id == MM_MSFT_GENERIC_MIDISYNTH);
+}
+
using PortNumberCache = base::hash_map<
MidiDeviceInfo,
std::priority_queue<uint32, std::vector<uint32>, std::greater<uint32>>,
@@ -828,6 +834,8 @@ class MidiServiceWinImpl : public MidiServiceWin {
make_scoped_refptr(new MidiOutputDeviceState(MidiDeviceInfo(caps)));
state->midi_handle = midi_out_handle;
const auto& state_device_info = state->device_info;
+ if (IsUnsupportedDevice(state_device_info))
+ return;
bool add_new_port = false;
uint32 port_number = 0;
{
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698