| Index: media/midi/midi_manager_win.h
|
| diff --git a/media/midi/midi_manager_win.h b/media/midi/midi_manager_win.h
|
| index b54f9d1855dddd7a8343c7053c2a495fb8ffdc01..9d1aee267d7f67ac05c8462dfd635bd983203143 100644
|
| --- a/media/midi/midi_manager_win.h
|
| +++ b/media/midi/midi_manager_win.h
|
| @@ -7,7 +7,6 @@
|
|
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/threading/thread.h"
|
| #include "base/time/time.h"
|
| @@ -22,10 +21,12 @@ class MidiServiceWinDelegate {
|
| virtual void OnCompleteInitialization(Result result) = 0;
|
| virtual void OnAddInputPort(MidiPortInfo info) = 0;
|
| virtual void OnAddOutputPort(MidiPortInfo info) = 0;
|
| - virtual void OnSetInputPortState(uint32 port_index, MidiPortState state) = 0;
|
| - virtual void OnSetOutputPortState(uint32 port_index, MidiPortState state) = 0;
|
| - virtual void OnReceiveMidiData(uint32 port_index,
|
| - const std::vector<uint8>& data,
|
| + virtual void OnSetInputPortState(uint32_t port_index,
|
| + MidiPortState state) = 0;
|
| + virtual void OnSetOutputPortState(uint32_t port_index,
|
| + MidiPortState state) = 0;
|
| + virtual void OnReceiveMidiData(uint32_t port_index,
|
| + const std::vector<uint8_t>& data,
|
| base::TimeTicks time) = 0;
|
| };
|
|
|
| @@ -35,8 +36,8 @@ class 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 port_number,
|
| - const std::vector<uint8>& data,
|
| + virtual void SendMidiDataAsync(uint32_t port_number,
|
| + const std::vector<uint8_t>& data,
|
| base::TimeTicks time) = 0;
|
| };
|
|
|
| @@ -49,18 +50,18 @@ class MidiManagerWin final : public MidiManager, public MidiServiceWinDelegate {
|
| void StartInitialization() final;
|
| void Finalize() final;
|
| void DispatchSendMidiData(MidiManagerClient* client,
|
| - uint32 port_index,
|
| - const std::vector<uint8>& data,
|
| + uint32_t port_index,
|
| + const std::vector<uint8_t>& data,
|
| double timestamp) final;
|
|
|
| // MidiServiceWinDelegate overrides:
|
| void OnCompleteInitialization(Result result) final;
|
| void OnAddInputPort(MidiPortInfo info) final;
|
| void OnAddOutputPort(MidiPortInfo info) final;
|
| - void OnSetInputPortState(uint32 port_index, MidiPortState state) final;
|
| - void OnSetOutputPortState(uint32 port_index, MidiPortState state) final;
|
| - void OnReceiveMidiData(uint32 port_index,
|
| - const std::vector<uint8>& data,
|
| + void OnSetInputPortState(uint32_t port_index, MidiPortState state) final;
|
| + void OnSetOutputPortState(uint32_t port_index, MidiPortState state) final;
|
| + void OnReceiveMidiData(uint32_t port_index,
|
| + const std::vector<uint8_t>& data,
|
| base::TimeTicks time) final;
|
|
|
| private:
|
|
|