| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <math.h> | 5 #include <math.h> |
| 6 #include <memory> | 6 #include <memory> |
| 7 | 7 |
| 8 #include "mojo/public/c/system/main.h" | 8 #include "mojo/public/c/system/main.h" |
| 9 #include "mojo/public/cpp/application/application_delegate.h" | 9 #include "mojo/public/cpp/application/application_delegate.h" |
| 10 #include "mojo/public/cpp/application/application_impl.h" | 10 #include "mojo/public/cpp/application/application_impl.h" |
| 11 #include "mojo/public/cpp/application/application_runner.h" | 11 #include "mojo/public/cpp/application/application_runner.h" |
| 12 #include "mojo/public/cpp/application/connect.h" |
| 12 #include "mojo/public/cpp/utility/run_loop.h" | 13 #include "mojo/public/cpp/utility/run_loop.h" |
| 13 #include "mojo/services/media/audio/interfaces/audio_server.mojom.h" | 14 #include "mojo/services/media/audio/interfaces/audio_server.mojom.h" |
| 14 #include "mojo/services/media/audio/interfaces/audio_track.mojom.h" | 15 #include "mojo/services/media/audio/interfaces/audio_track.mojom.h" |
| 15 #include "mojo/services/media/common/cpp/circular_buffer_media_pipe_adapter.h" | 16 #include "mojo/services/media/common/cpp/circular_buffer_media_pipe_adapter.h" |
| 16 #include "mojo/services/media/common/cpp/linear_transform.h" | 17 #include "mojo/services/media/common/cpp/linear_transform.h" |
| 17 #include "mojo/services/media/common/cpp/local_time.h" | 18 #include "mojo/services/media/common/cpp/local_time.h" |
| 18 #include "mojo/services/media/common/interfaces/rate_control.mojom.h" | 19 #include "mojo/services/media/common/interfaces/rate_control.mojom.h" |
| 19 | 20 |
| 20 namespace mojo { | 21 namespace mojo { |
| 21 namespace media { | 22 namespace media { |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 }; | 64 }; |
| 64 | 65 |
| 65 void PlayToneApp::Quit() { | 66 void PlayToneApp::Quit() { |
| 66 rate_control_.reset(); | 67 rate_control_.reset(); |
| 67 audio_pipe_.reset(); | 68 audio_pipe_.reset(); |
| 68 audio_track_.reset(); | 69 audio_track_.reset(); |
| 69 audio_server_.reset(); | 70 audio_server_.reset(); |
| 70 } | 71 } |
| 71 | 72 |
| 72 void PlayToneApp::Initialize(ApplicationImpl* app) { | 73 void PlayToneApp::Initialize(ApplicationImpl* app) { |
| 73 app->ConnectToServiceDeprecated("mojo:audio_server", &audio_server_); | 74 mojo::ConnectToService(app->shell(), "mojo:audio_server", |
| 75 GetProxy(&audio_server_)); |
| 74 audio_server_.set_connection_error_handler([this]() { | 76 audio_server_.set_connection_error_handler([this]() { |
| 75 OnConnectionError("audio_server"); | 77 OnConnectionError("audio_server"); |
| 76 }); | 78 }); |
| 77 | 79 |
| 78 audio_server_->CreateTrack(GetProxy(&audio_track_)); | 80 audio_server_->CreateTrack(GetProxy(&audio_track_)); |
| 79 audio_track_.set_connection_error_handler([this]() { | 81 audio_track_.set_connection_error_handler([this]() { |
| 80 OnConnectionError("audio_track"); | 82 OnConnectionError("audio_track"); |
| 81 }); | 83 }); |
| 82 | 84 |
| 83 // Query the sink's format capabilities. | 85 // Query the sink's format capabilities. |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 } // namespace audio | 249 } // namespace audio |
| 248 } // namespace media | 250 } // namespace media |
| 249 } // namespace mojo | 251 } // namespace mojo |
| 250 | 252 |
| 251 MojoResult MojoMain(MojoHandle app_request) { | 253 MojoResult MojoMain(MojoHandle app_request) { |
| 252 mojo::ApplicationRunner runner( | 254 mojo::ApplicationRunner runner( |
| 253 std::unique_ptr<mojo::media::audio::examples::PlayToneApp>( | 255 std::unique_ptr<mojo::media::audio::examples::PlayToneApp>( |
| 254 new mojo::media::audio::examples::PlayToneApp())); | 256 new mojo::media::audio::examples::PlayToneApp())); |
| 255 return runner.Run(app_request); | 257 return runner.Run(app_request); |
| 256 } | 258 } |
| OLD | NEW |