diff options
| author | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 12:48:01 +0000 |
|---|---|---|
| committer | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 12:48:01 +0000 |
| commit | 52a486a8db7720ea0a55f9993750819adabeed1c (patch) | |
| tree | 1fcedcc9d61dc0b12115d9c1eced21898bcb4633 /media | |
| parent | 73113403b7d0fa04308689ebc79e765f65a3efad (diff) | |
| download | chromium_src-52a486a8db7720ea0a55f9993750819adabeed1c.zip chromium_src-52a486a8db7720ea0a55f9993750819adabeed1c.tar.gz chromium_src-52a486a8db7720ea0a55f9993750819adabeed1c.tar.bz2 | |
Revert "Web MIDI: enable important logs in release build"
This reverts commit 73113403b7d0fa04308689ebc79e765f65a3efad.
This is causing chromeos bot failures:
snippet:
chromeos-chrome-34.0.1842.0_alpha-r1:
../../../../../../../home/chrome-bot/chrome_root/src/content/browser/browser_main_loop.cc:475:
error: undefined reference to 'media::MidiManager::Create()'
chromeos-chrome-34.0.1842.0_alpha-r1: collect2: error: ld returned 1 exit status
chromeos-chrome-34.0.1842.0_alpha-r1: ninja: build stopped: subcommand failed.
link to full output:
http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28amd64%29/builds/14268/steps/BuildPackages/logs/stdio
TBR=toyoshim@chromium.org
BUG=None
Review URL: https://codereview.chromium.org/168523002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251567 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/midi/midi_manager.cc | 5 | ||||
| -rw-r--r-- | media/midi/midi_manager_alsa.cc | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/media/midi/midi_manager.cc b/media/midi/midi_manager.cc index da5de7f..4447a05 100644 --- a/media/midi/midi_manager.cc +++ b/media/midi/midi_manager.cc @@ -6,14 +6,13 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/logging.h" namespace media { #if !defined(OS_MACOSX) && !defined(OS_WIN) && !defined(USE_ALSA) && \ - !defined(OS_ANDROID) && !defined(OS_CHROMEOS) + !defined(OS_ANDROID) +// TODO(toyoshim): implement MidiManager for other platforms. MidiManager* MidiManager::Create() { - LOG(ERROR) << "Platform specific MIDIManager is not implemented."; return new MidiManager; } #endif diff --git a/media/midi/midi_manager_alsa.cc b/media/midi/midi_manager_alsa.cc index e91cae8..4716db2 100644 --- a/media/midi/midi_manager_alsa.cc +++ b/media/midi/midi_manager_alsa.cc @@ -145,12 +145,12 @@ bool MidiManagerAlsa::Initialize() { snd_ctl_t* handle; int err = snd_ctl_open(&handle, id.c_str(), 0); if (err != 0) { - LOG(ERROR) << "snd_ctl_open fails: " << snd_strerror(err); + DLOG(ERROR) << "snd_ctl_open fails: " << snd_strerror(err); continue; } err = snd_ctl_card_info(handle, card); if (err != 0) { - LOG(ERROR) << "snd_ctl_card_info fails: " << snd_strerror(err); + DLOG(ERROR) << "snd_ctl_card_info fails: " << snd_strerror(err); snd_ctl_close(handle); continue; } @@ -171,7 +171,7 @@ bool MidiManagerAlsa::Initialize() { scoped_refptr<MidiDeviceInfo> port = new MidiDeviceInfo( this, id, card, output ? midi_out : midi_in, device); if (!port->IsOpened()) { - LOG(ERROR) << "MidiDeviceInfo open fails"; + DLOG(ERROR) << "MidiDeviceInfo open fails"; continue; } if (input) { @@ -187,7 +187,7 @@ bool MidiManagerAlsa::Initialize() { } if (pipe(pipe_fd_) < 0) { - PLOG(ERROR) << "pipe() failed"; + DPLOG(ERROR) << "pipe() failed"; return false; } event_thread_.Start(); @@ -266,7 +266,7 @@ void MidiManagerAlsa::EventReset() { void MidiManagerAlsa::EventLoop() { if (HANDLE_EINTR(poll(&poll_fds_[0], poll_fds_.size(), -1)) < 0) { - PLOG(ERROR) << "Couldn't poll(). Stop to poll input MIDI devices."; + DPLOG(ERROR) << "Couldn't poll(). Stop to poll input MIDI devices."; // TODO(toyoshim): Handle device disconnection, and try to reconnect? return; } |