SourceState: Coalesce OnNewBuffers() CB to include OnTextBuffers() behavior

media/formats/mp3/mp3_stream_parser.cc

 // Copyright 2014 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/formats/mp3/mp3_stream_parser.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "media/base/bit_reader.h"
@@ skipping 99 matching lines @@
 MP3StreamParser::MP3StreamParser()
     : state_(UNINITIALIZED),
       in_media_segment_(false) {
 }
 
 MP3StreamParser::~MP3StreamParser() {}
 
 void MP3StreamParser::Init(const InitCB& init_cb,
                            const NewConfigCB& config_cb,
                            const NewBuffersCB& new_buffers_cb,
-                           const NewTextBuffersCB& text_cb,
+                           bool ignore_text_tracks,
                            const NeedKeyCB& need_key_cb,
                            const NewMediaSegmentCB& new_segment_cb,
                            const base::Closure& end_of_segment_cb,
                            const LogCB& log_cb) {
   DVLOG(1) << __FUNCTION__;
   DCHECK_EQ(state_, UNINITIALIZED);
   init_cb_ = init_cb;
   config_cb_ = config_cb;
   new_buffers_cb_ = new_buffers_cb;
   new_segment_cb_ = new_segment_cb;
@@ skipping 460 matching lines @@
 
 bool MP3StreamParser::SendBuffers(BufferQueue* buffers, bool end_of_segment) {
   DCHECK(!buffers->empty());
 
   if (!in_media_segment_) {
     in_media_segment_ = true;
     new_segment_cb_.Run();
   }
 
   BufferQueue empty_video_buffers;
-  if (!new_buffers_cb_.Run(*buffers, empty_video_buffers))
+  TextBufferQueueMap empty_text_map;
+  if (!new_buffers_cb_.Run(*buffers, empty_video_buffers, empty_text_map))
     return false;
   buffers->clear();
 
   if (end_of_segment) {
     in_media_segment_ = false;
     end_of_segment_cb_.Run();
   }
 
   return true;
 }
 
 }  // namespace media