Removed PushSource::Packet. SeekableBuffer.current_time() fixed to return

media/audio/simple_sources.h

 // Copyright (c) 2010 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.
 
 #ifndef MEDIA_AUDIO_SIMPLE_SOURCES_H_
 #define MEDIA_AUDIO_SIMPLE_SOURCES_H_
 
 #include <list>
 
 #include "base/lock.h"
 #include "media/audio/audio_output.h"
+#include "media/base/seekable_buffer.h"
 
 // An audio source that produces a pure sinusoidal tone.
 class SineWaveAudioSource : public AudioOutputStream::AudioSourceCallback {
  public:
   enum Format {
     FORMAT_8BIT_LINEAR_PCM,
     FORMAT_16BIT_LINEAR_PCM,
   };
   // |channels| is the number of audio channels, |freq| is the frequency in
   // hertz and it has to be less than half of the sampling frequency
@@ skipping 48 matching lines @@
   // Implementation of AudioSourceCallback.
   virtual uint32 OnMoreData(AudioOutputStream* stream,
                             void* dest, uint32 max_size, uint32 pending_bytes);
   virtual void OnClose(AudioOutputStream* stream);
   virtual void OnError(AudioOutputStream* stream, int code);
 
   // Discard all buffered data and reset to initial state.
   void ClearAll();
 
  private:
-  // Defines the unit of playback. We own the memory pointed by |buffer|.
-  struct Packet {
-    char* buffer;
-    uint32 size;
-  };
-
   // Free acquired resources.
   void CleanUp();
 
-  typedef std::list<Packet> PacketList;
-  PacketList packets_;
-  uint32 buffered_bytes_;
-  uint32 front_buffer_consumed_;
-  // Serialize access to packets_ and buffered_bytes_ using this lock.
-  Lock lock_;
+  media::SeekableBuffer buffer_;
+  // Serialize access to |buffer_| using this lock.
+  Lock buffer_lock_;
 };
 
 #endif  // MEDIA_AUDIO_SIMPLE_SOURCES_H_