| Index: media/midi/midi_manager_alsa.cc
|
| diff --git a/media/midi/midi_manager_alsa.cc b/media/midi/midi_manager_alsa.cc
|
| index c57a2ef2be305068dc2b37c3fcfdf2ed4eb83ac3..61975a7cbb7e84bf79d236d760340dff2ef3e067 100644
|
| --- a/media/midi/midi_manager_alsa.cc
|
| +++ b/media/midi/midi_manager_alsa.cc
|
| @@ -181,7 +181,7 @@ void MidiManagerAlsa::StartInitialization() {
|
| snd_seq_open(&tmp_seq, kAlsaHw, SND_SEQ_OPEN_INPUT, SND_SEQ_NONBLOCK);
|
| if (err != 0) {
|
| VLOG(1) << "snd_seq_open fails: " << snd_strerror(err);
|
| - return CompleteInitialization(Result::INITIALIZATION_ERROR);
|
| + return CompleteInitialization(mojom::Result::INITIALIZATION_ERROR);
|
| }
|
| ScopedSndSeqPtr in_client(tmp_seq);
|
| tmp_seq = nullptr;
|
| @@ -190,7 +190,7 @@ void MidiManagerAlsa::StartInitialization() {
|
| err = snd_seq_open(&tmp_seq, kAlsaHw, SND_SEQ_OPEN_OUTPUT, 0);
|
| if (err != 0) {
|
| VLOG(1) << "snd_seq_open fails: " << snd_strerror(err);
|
| - return CompleteInitialization(Result::INITIALIZATION_ERROR);
|
| + return CompleteInitialization(mojom::Result::INITIALIZATION_ERROR);
|
| }
|
| ScopedSndSeqPtr out_client(tmp_seq);
|
| tmp_seq = nullptr;
|
| @@ -200,12 +200,12 @@ void MidiManagerAlsa::StartInitialization() {
|
| err = snd_seq_set_client_name(in_client.get(), "Chrome (input)");
|
| if (err != 0) {
|
| VLOG(1) << "snd_seq_set_client_name fails: " << snd_strerror(err);
|
| - return CompleteInitialization(Result::INITIALIZATION_ERROR);
|
| + return CompleteInitialization(mojom::Result::INITIALIZATION_ERROR);
|
| }
|
| err = snd_seq_set_client_name(out_client.get(), "Chrome (output)");
|
| if (err != 0) {
|
| VLOG(1) << "snd_seq_set_client_name fails: " << snd_strerror(err);
|
| - return CompleteInitialization(Result::INITIALIZATION_ERROR);
|
| + return CompleteInitialization(mojom::Result::INITIALIZATION_ERROR);
|
| }
|
|
|
| // Create input port.
|
| @@ -214,7 +214,7 @@ void MidiManagerAlsa::StartInitialization() {
|
| if (in_port_id_ < 0) {
|
| VLOG(1) << "snd_seq_create_simple_port fails: "
|
| << snd_strerror(in_port_id_);
|
| - return CompleteInitialization(Result::INITIALIZATION_ERROR);
|
| + return CompleteInitialization(mojom::Result::INITIALIZATION_ERROR);
|
| }
|
|
|
| // Subscribe to the announce port.
|
| @@ -232,7 +232,7 @@ void MidiManagerAlsa::StartInitialization() {
|
| if (err != 0) {
|
| VLOG(1) << "snd_seq_subscribe_port on the announce port fails: "
|
| << snd_strerror(err);
|
| - return CompleteInitialization(Result::INITIALIZATION_ERROR);
|
| + return CompleteInitialization(mojom::Result::INITIALIZATION_ERROR);
|
| }
|
|
|
| // Initialize decoder.
|
| @@ -248,20 +248,20 @@ void MidiManagerAlsa::StartInitialization() {
|
| device::udev_monitor_new_from_netlink(udev.get(), kUdev));
|
| if (!udev_monitor.get()) {
|
| VLOG(1) << "udev_monitor_new_from_netlink fails";
|
| - return CompleteInitialization(Result::INITIALIZATION_ERROR);
|
| + return CompleteInitialization(mojom::Result::INITIALIZATION_ERROR);
|
| }
|
| err = device::udev_monitor_filter_add_match_subsystem_devtype(
|
| udev_monitor.get(), kUdevSubsystemSound, nullptr);
|
| if (err != 0) {
|
| VLOG(1) << "udev_monitor_add_match_subsystem fails: "
|
| << base::safe_strerror(-err);
|
| - return CompleteInitialization(Result::INITIALIZATION_ERROR);
|
| + return CompleteInitialization(mojom::Result::INITIALIZATION_ERROR);
|
| }
|
| err = device::udev_monitor_enable_receiving(udev_monitor.get());
|
| if (err != 0) {
|
| VLOG(1) << "udev_monitor_enable_receiving fails: "
|
| << base::safe_strerror(-err);
|
| - return CompleteInitialization(Result::INITIALIZATION_ERROR);
|
| + return CompleteInitialization(mojom::Result::INITIALIZATION_ERROR);
|
| }
|
|
|
| // Success! Now, initialize members from the temporaries. Do not
|
| @@ -291,7 +291,7 @@ void MidiManagerAlsa::StartInitialization() {
|
| base::Bind(&MidiManagerAlsa::ScheduleEventLoop, base::Unretained(this)));
|
| send_thread_.Start();
|
|
|
| - CompleteInitialization(Result::OK);
|
| + CompleteInitialization(mojom::Result::OK);
|
| }
|
|
|
| void MidiManagerAlsa::Finalize() {
|
|
|