Add (optional) options to Run[Main]Application().

examples/audio_play_test/play_tone.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <math.h>
 #include <memory>
 
 #include "mojo/public/c/system/main.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/public/cpp/application/application_runner.h"
+#include "mojo/public/cpp/application/application_impl_base.h"
 #include "mojo/public/cpp/application/connect.h"
+#include "mojo/public/cpp/application/run_application.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 #include "mojo/services/media/audio/interfaces/audio_server.mojom.h"
 #include "mojo/services/media/audio/interfaces/audio_track.mojom.h"
 #include "mojo/services/media/common/cpp/circular_buffer_media_pipe_adapter.h"
 #include "mojo/services/media/common/cpp/linear_transform.h"
 #include "mojo/services/media/common/cpp/local_time.h"
 #include "mojo/services/media/common/interfaces/timelines.mojom.h"
 
 namespace mojo {
 namespace media {
 namespace audio {
 namespace examples {
 
 static constexpr uint32_t SAMP_FREQ = 48000;
 static constexpr uint32_t CHUNK_USEC = 10000;
 static constexpr uint32_t BUF_LO_WATER_USEC = 500000;
 static constexpr uint32_t BUF_HI_WATER_USEC = BUF_LO_WATER_USEC
                                             + (4 * CHUNK_USEC);
 static constexpr uint32_t BUF_DEPTH_USEC    = BUF_HI_WATER_USEC
                                             + (4 * CHUNK_USEC);
 static constexpr uint32_t FRAME_BYTES = sizeof(int16_t);
 
 static inline constexpr uint32_t USecToBytes(uint64_t usec) {
   return ((usec * SAMP_FREQ) / 1000000) * FRAME_BYTES;
 }
 
-class PlayToneApp : public ApplicationDelegate {
+class PlayToneApp : public ApplicationImplBase {
  public:
-  ~PlayToneApp() override { Quit(); }
+  ~PlayToneApp() override { OnQuit(); }
 
-  // ApplicationDelegate
-  void Initialize(ApplicationImpl* app) override;
-  void Quit() override;
+  // ApplicationImplBase overrides:
+  void OnInitialize() override;
+  void OnQuit() override;
 
  private:
   void GenerateToneCbk(MediaResult res);
   void PlayTone(double freq_hz, double amplitude, double duration_sec);
   void PostShutdown();
   void Shutdown();
   void OnConnectionError(const std::string& connection_name);
 
   AudioServerPtr audio_server_;
   AudioTrackPtr audio_track_;
   TimelineConsumerPtr timeline_consumer_;
   std::unique_ptr<CircularBufferMediaPipeAdapter> audio_pipe_;
 
   bool     clock_started_ = false;
   uint64_t media_time_    = 0;
   double   freq_hz_       = 440.0;
   double   amplitude_     = 1.0;
   bool     shutting_down_ = false;
 };
 
-void PlayToneApp::Quit() {
+void PlayToneApp::OnQuit() {
   timeline_consumer_.reset();
   audio_pipe_.reset();
   audio_track_.reset();
   audio_server_.reset();
 }
 
-void PlayToneApp::Initialize(ApplicationImpl* app) {
-  mojo::ConnectToService(app->shell(), "mojo:audio_server",
+void PlayToneApp::OnInitialize() {
+  mojo::ConnectToService(shell(), "mojo:audio_server",
                          GetProxy(&audio_server_));
   audio_server_.set_connection_error_handler([this]() {
     OnConnectionError("audio_server");
   });
 
   audio_server_->CreateTrack(GetProxy(&audio_track_));
   audio_track_.set_connection_error_handler([this]() {
     OnConnectionError("audio_track");
   });
 
@@ skipping 141 matching lines @@
     audio_pipe_->ResetSignalCallback();
   }
   audio_pipe_ = nullptr;
 
   mojo::RunLoop::current()->PostDelayedTask([this]() -> void {
     Shutdown();
   }, 0);
 }
 
 void PlayToneApp::Shutdown() {
-  Quit();
+  OnQuit();
   RunLoop::current()->Quit();
 }
 
 }  // namespace examples
 }  // namespace audio
 }  // namespace media
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle app_request) {
-  mojo::ApplicationRunner runner(
-      std::unique_ptr<mojo::media::audio::examples::PlayToneApp>(
-          new mojo::media::audio::examples::PlayToneApp()));
-  return runner.Run(app_request);
+  mojo::media::audio::examples::PlayToneApp play_tone_app;
+  return mojo::RunMainApplication(app_request, &play_tone_app);
 }