diff options
| author | toyoshim <toyoshim@chromium.org> | 2015-04-01 20:52:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-02 03:53:09 +0000 |
| commit | 6562456a4c1e591e1c0b9a1dcd84e8f31a38af95 (patch) | |
| tree | 13740ece3e2b21e3d2fa9c80938a505a74ff9cae /media | |
| parent | a0e8c4b6d24d023997323f7ce20df759739c351b (diff) | |
| download | chromium_src-6562456a4c1e591e1c0b9a1dcd84e8f31a38af95.zip chromium_src-6562456a4c1e591e1c0b9a1dcd84e8f31a38af95.tar.gz chromium_src-6562456a4c1e591e1c0b9a1dcd84e8f31a38af95.tar.bz2 | |
Web MIDI: convert MMVERSION to "major.minor" format string
TEST=manual check # "256" => "1.0"
BUG=na
Review URL: https://codereview.chromium.org/1055563002
Cr-Commit-Position: refs/heads/master@{#323422}
Diffstat (limited to 'media')
| -rw-r--r-- | media/midi/midi_manager_win.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/media/midi/midi_manager_win.cc b/media/midi/midi_manager_win.cc index 761e0e7..6c08014 100644 --- a/media/midi/midi_manager_win.cc +++ b/media/midi/midi_manager_win.cc @@ -34,6 +34,7 @@ #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" @@ -82,6 +83,10 @@ std::string GetOutErrorMessage(MMRESULT result) { return base::WideToUTF8(text); } +std::string MmversionToString(MMVERSION version) { + return base::StringPrintf("%d.%d", HIBYTE(version), LOBYTE(version)); +} + class MIDIHDRDeleter { public: void operator()(MIDIHDR* header) { @@ -665,7 +670,7 @@ class MidiServiceWinImpl : public MidiServiceWin { // TODO(toyoshim): Retrieve the manifacturer name. "", base::WideToUTF8(product_name), - base::IntToString(static_cast<int>(driver_version)), + MmversionToString(driver_version), MIDI_PORT_OPENED); task_thread_.message_loop()->PostTask( FROM_HERE, base::Bind(&MidiServiceWinImpl::AddInputPortOnTaskThread, @@ -845,7 +850,7 @@ class MidiServiceWinImpl : public MidiServiceWin { // TODO(toyoshim): Retrieve the manifacturer name. "", base::WideToUTF8(product_name), - base::IntToString(static_cast<int>(driver_version)), + MmversionToString(driver_version), MIDI_PORT_OPENED); task_thread_.message_loop()->PostTask( FROM_HERE, base::Bind(&MidiServiceWinImpl::AddOutputPortOnTaskThread, |