Commit 4399414e authored by toyoshim's avatar toyoshim Committed by Commit bot

Web MIDI: remove old Windows backend

The new backend supporting dynamic instantiation on Windows was rolled
out to the stable channel via a field trial flag.
This new backend solves some long-living problems, e.g., grabbing
devices forever, battery concerns, and stability.

Since the feature was enabled by default, and have worked well,
I want to remove the old backend now.

Another change that renames new backend will follow.

BUG=672793

Review-Url: https://codereview.chromium.org/2841493003
Cr-Commit-Position: refs/heads/master@{#466904}
parent f0aff0ca
...@@ -144,8 +144,6 @@ component("midi") { ...@@ -144,8 +144,6 @@ component("midi") {
sources += [ sources += [
"dynamically_initialized_midi_manager_win.cc", "dynamically_initialized_midi_manager_win.cc",
"dynamically_initialized_midi_manager_win.h", "dynamically_initialized_midi_manager_win.h",
"midi_manager_win.cc",
"midi_manager_win.h",
"midi_manager_winrt.cc", "midi_manager_winrt.cc",
"midi_manager_winrt.h", "midi_manager_winrt.h",
] ]
......
# On Android port and USB support, yhirano@ is the best reviewer. # Following reviewers should be able to review all code under //media/midi.
# On Win32 port, yukawa@ is the best reviewer. # But it would be a good idea to involve {yukawa,agoode}@chromium.org if
# they are the original author of files you are touching.
toyoshim@chromium.org toyoshim@chromium.org
yhirano@chromium.org yhirano@chromium.org
yukawa@chromium.org
per-file *.mojom=set noparent per-file *.mojom=set noparent
per-file *.mojom=file://ipc/SECURITY_OWNERS per-file *.mojom=file://ipc/SECURITY_OWNERS
......
...@@ -22,10 +22,13 @@ ...@@ -22,10 +22,13 @@
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h" #include "base/synchronization/lock.h"
#include "base/win/windows_version.h"
#include "device/usb/usb_ids.h" #include "device/usb/usb_ids.h"
#include "media/midi/message_util.h" #include "media/midi/message_util.h"
#include "media/midi/midi_manager_winrt.h"
#include "media/midi/midi_port_info.h" #include "media/midi/midi_port_info.h"
#include "media/midi/midi_service.h" #include "media/midi/midi_service.h"
#include "media/midi/midi_switches.h"
namespace midi { namespace midi {
...@@ -852,4 +855,11 @@ void DynamicallyInitializedMidiManagerWin::SendOnTaskRunner( ...@@ -852,4 +855,11 @@ void DynamicallyInitializedMidiManagerWin::SendOnTaskRunner(
base::Unretained(this), client, data.size())); base::Unretained(this), client, data.size()));
} }
MidiManager* MidiManager::Create(MidiService* service) {
if (base::FeatureList::IsEnabled(features::kMidiManagerWinrt) &&
base::win::GetVersion() >= base::win::VERSION_WIN10)
return new MidiManagerWinrt(service);
return new DynamicallyInitializedMidiManagerWin(service);
}
} // namespace midi } // namespace midi
This diff is collapsed.
// 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.
#ifndef MEDIA_MIDI_MIDI_MANAGER_WIN_H_
#define MEDIA_MIDI_MIDI_MANAGER_WIN_H_
#include <stdint.h>
#include <memory>
#include <vector>
#include "base/macros.h"
#include "base/threading/thread.h"
#include "base/time/time.h"
#include "media/midi/midi_manager.h"
#include "media/midi/midi_service.mojom.h"
namespace midi {
class MidiService;
class MidiServiceWinDelegate {
public:
virtual ~MidiServiceWinDelegate() {}
virtual void OnCompleteInitialization(mojom::Result result) = 0;
virtual void OnAddInputPort(MidiPortInfo info) = 0;
virtual void OnAddOutputPort(MidiPortInfo info) = 0;
virtual void OnSetInputPortState(uint32_t port_index,
mojom::PortState state) = 0;
virtual void OnSetOutputPortState(uint32_t port_index,
mojom::PortState state) = 0;
virtual void OnReceiveMidiData(uint32_t port_index,
const std::vector<uint8_t>& data,
base::TimeTicks time) = 0;
};
class MidiServiceWin {
public:
virtual ~MidiServiceWin() {}
// This method may return before the initialization is completed.
virtual void InitializeAsync(MidiServiceWinDelegate* delegate) = 0;
// This method may return before the specified data is actually sent.
virtual void SendMidiDataAsync(uint32_t port_number,
const std::vector<uint8_t>& data,
base::TimeTicks time) = 0;
};
class MidiManagerWin final : public MidiManager, public MidiServiceWinDelegate {
public:
explicit MidiManagerWin(MidiService* service);
~MidiManagerWin() override;
// MidiManager overrides:
void StartInitialization() final;
void Finalize() final;
void DispatchSendMidiData(MidiManagerClient* client,
uint32_t port_index,
const std::vector<uint8_t>& data,
double timestamp) final;
// MidiServiceWinDelegate overrides:
void OnCompleteInitialization(mojom::Result result) final;
void OnAddInputPort(MidiPortInfo info) final;
void OnAddOutputPort(MidiPortInfo info) final;
void OnSetInputPortState(uint32_t port_index, mojom::PortState state) final;
void OnSetOutputPortState(uint32_t port_index, mojom::PortState state) final;
void OnReceiveMidiData(uint32_t port_index,
const std::vector<uint8_t>& data,
base::TimeTicks time) final;
private:
std::unique_ptr<MidiServiceWin> midi_service_;
DISALLOW_COPY_AND_ASSIGN(MidiManagerWin);
};
} // namespace midi
#endif // MEDIA_MIDI_MIDI_MANAGER_WIN_H_
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment