Cast: Refactoring Cast API's

media/cast/audio_sender/audio_sender.cc

 // Copyright 2013 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 "media/cast/audio_sender/audio_sender.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "media/cast/audio_sender/audio_encoder.h"
@@ skipping 91 matching lines @@
             transport_sender_,
             NULL,  // paced sender.
             rtp_audio_sender_statistics_.get(),
             NULL,
             audio_config.rtcp_mode,
             base::TimeDelta::FromMilliseconds(audio_config.rtcp_interval),
             audio_config.sender_ssrc,
             audio_config.incoming_feedback_ssrc,
             audio_config.rtcp_c_name),
       timers_initialized_(false),
-      initialization_status_(STATUS_INITIALIZED),
+      cast_initialization_cb_(STATUS_AUDIO_UNINITIALIZED),
       weak_factory_(this) {
   if (!audio_config.use_external_encoder) {
     audio_encoder_ =
         new AudioEncoder(cast_environment,
                          audio_config,
                          base::Bind(&AudioSender::SendEncodedAudioFrame,
                                     weak_factory_.GetWeakPtr()));
-    initialization_status_ = audio_encoder_->InitializationResult();
+    cast_initialization_cb_ = audio_encoder_->InitializationResult();
   }
 }
 
 AudioSender::~AudioSender() {}
 
 void AudioSender::InitializeTimers() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   if (!timers_initialized_) {
     timers_initialized_ = true;
     ScheduleNextRtcpReport();
   }
 }
 
 void AudioSender::InsertAudio(const AudioBus* audio_bus,
                               const base::TimeTicks& recorded_time,
                               const base::Closure& done_callback) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   DCHECK(audio_encoder_.get()) << "Invalid internal state";
-
   audio_encoder_->InsertAudio(audio_bus, recorded_time, done_callback);
 }
 
 void AudioSender::SendEncodedAudioFrame(
     scoped_ptr<transport::EncodedAudioFrame> audio_frame,
     const base::TimeTicks& recorded_time) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   InitializeTimers();
   cast_environment_->PostTask(
       CastEnvironment::TRANSPORT,
@@ skipping 52 matching lines @@
 }
 
 void AudioSender::ResendPacketsOnTransportThread(
     const transport::MissingFramesAndPacketsMap& missing_packets) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::TRANSPORT));
   transport_sender_->ResendPackets(true, missing_packets);
 }
 
 }  // namespace cast
 }  // namespace media