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

examples/audio_play_test/play_wav.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 <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/system/data_pipe.h"
 #include "mojo/public/cpp/system/wait.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/network/interfaces/network_service.mojom.h"
 #include "mojo/services/network/interfaces/url_loader.mojom.h"
@@ skipping 20 matching lines @@
 namespace audio {
 namespace examples {
 
 static constexpr const char* TEST_FILE =
   "http://localhost/test_content/piano2.wav";
 static constexpr uint32_t BUF_DEPTH_USEC    = 500000;
 static constexpr uint32_t BUF_LO_WATER_USEC = 400000;
 static constexpr uint32_t BUF_HI_WATER_USEC = 450000;
 static constexpr uint32_t CHUNK_SIZE_USEC   = 10000;
 
-class PlayWAVApp : public ApplicationDelegate {
+class PlayWAVApp : public ApplicationImplBase {
  public:
-  ~PlayWAVApp() override { Quit(); }
+  ~PlayWAVApp() override { OnQuit(); }
 
-  // ApplicationDelegate
-  void Initialize(ApplicationImpl* app) override;
-  void Quit() override;
+  // ApplicationImplBase overrides:
+  void OnInitialize() override;
+  void OnQuit() override;
 
  private:
   using AudioPipePtr = std::unique_ptr<CircularBufferMediaPipeAdapter>;
   using AudioPacket  = CircularBufferMediaPipeAdapter::MappedPacket;
   using PacketCbk    = MediaConsumer::SendPacketCallback;
 
   // TODO(johngro): endianness!
   struct PACKED RIFFChunkHeader {
     uint32_t  four_cc;
     uint32_t  length;
@@ skipping 81 matching lines @@
 
 const std::set<uint16_t> PlayWAVApp::VALID_FRAME_RATES({
   8000, 16000, 24000, 32000, 48000,
   11025, 22050, 44100,
 });
 
 const std::set<uint16_t> PlayWAVApp::VALID_BITS_PER_SAMPLES({
   8, 16,
 });
 
-void PlayWAVApp::Initialize(ApplicationImpl* app) {
-  ConnectToService(app->shell(), "mojo:audio_server", GetProxy(&audio_server_));
+void PlayWAVApp::OnInitialize() {
+  ConnectToService(shell(), "mojo:audio_server", GetProxy(&audio_server_));
   audio_server_.set_connection_error_handler([this]() {
     OnConnectionError("audio_server");
   });
 
-  ConnectToService(app->shell(), "mojo:network_service",
+  ConnectToService(shell(), "mojo:network_service",
                    GetProxy(&network_service_));
   audio_server_.set_connection_error_handler([this]() {
     OnConnectionError("network_service");
   });
 
   network_service_->CreateURLLoader(GetProxy(&url_loader_));
   url_loader_.set_connection_error_handler([this]() {
     OnConnectionError("url_loader");
   });
 
   playout_complete_cbk_ = PacketCbk([this](MediaConsumer::SendResult res) {
                                       this->OnPlayoutComplete(res);
                                     });
 
   URLRequestPtr req(URLRequest::New());
   req->url    = TEST_FILE;
   req->method = "GET";
 
   auto cbk = [this](URLResponsePtr resp) { ProcessHTTPResponse(resp.Pass()); };
   url_loader_->Start(req.Pass(), URLLoader::StartCallback(cbk));
 }
 
-void PlayWAVApp::Quit() {
+void PlayWAVApp::OnQuit() {
   if (audio_packet_.packet()) {
     MOJO_DCHECK(audio_pipe_);
     audio_pipe_->CancelMediaPacket(&audio_packet_);
   }
 
   payload_.reset();
   url_loader_.reset();
   network_service_.reset();
   audio_pipe_.reset();
   timeline_consumer_.reset();
@@ skipping 340 matching lines @@
 // have registered on interfaces) before finally destroying our application
 // object.
 //
 // The net result is that we end up spurious "connection closed unexpectedly"
 // error messages when we are actually shutting down cleanly.  For now, we
 // suppress this by having a shutting_down_ flag and suppressing the error
 // message which show up after shutdown has been triggered.  When the proper
 // pattern for shutting down an app has been established, come back here and
 // remove all this junk.
 void PlayWAVApp::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::PlayWAVApp>(
-          new mojo::media::audio::examples::PlayWAVApp()));
-  return runner.Run(app_request);
+  mojo::media::audio::examples::PlayWAVApp play_wav_app;
+  return mojo::RunMainApplication(app_request, &play_wav_app);
 }