Motown: Change media type (stream type) representation

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"
@@ skipping 104 matching lines @@
 
   // Grab the rate control interface for our audio renderer.
   audio_track_->GetRateControl(GetProxy(&rate_control_));
   rate_control_.set_connection_error_handler([this]() {
     OnConnectionError("rate_control");
   });
 
   // Configure our sink for 16-bit 48KHz mono.
   AudioTrackConfigurationPtr cfg = AudioTrackConfiguration::New();
 
-  LpcmMediaTypeDetailsPtr pcm_cfg = LpcmMediaTypeDetails::New();
-  pcm_cfg->sample_format     = LpcmSampleFormat::SIGNED_16;
+  AudioMediaTypeDetailsPtr pcm_cfg = AudioMediaTypeDetails::New();
+  pcm_cfg->sample_format     = AudioSampleFormat::SIGNED_16;
   pcm_cfg->channels          = 1;
   pcm_cfg->frames_per_second = SAMP_FREQ;
 
   cfg->media_type = MediaType::New();
-  cfg->media_type->scheme = MediaTypeScheme::LPCM;
+  cfg->media_type->medium = MediaTypeMedium::AUDIO;
   cfg->media_type->details = MediaTypeDetails::New();
-  cfg->media_type->details->set_lpcm(pcm_cfg.Pass());
+  cfg->media_type->details->set_audio(pcm_cfg.Pass());
+  cfg->media_type->encoding = MediaType::kAudioEncodingLpcm;
 
   MediaConsumerPtr pipe;
   audio_track_->Configure(cfg.Pass(), GetProxy(&pipe));
 
   // Now that the configuration request is in-flight and we our media pipe
   // proxy, pass its interface to our circular buffer helper, set up our
   // high/low water marks, register our callback, and start to buffer our audio.
   audio_pipe_.reset(new CircularBufferMediaPipeAdapter(pipe.Pass()));
   audio_pipe_->Init(USecToBytes(BUF_DEPTH_USEC));
   audio_pipe_->SetSignalCallback(
@@ skipping 102 matching lines @@
 }  // 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);
 }