| Index: talk/app/webrtc/mediastreaminterface.h | 
| diff --git a/talk/app/webrtc/mediastreaminterface.h b/talk/app/webrtc/mediastreaminterface.h | 
| index 5327bd2f12f2b3164df79c3a9f011c876180cdb6..0997d73dc0cf0a4b7daa99cd68c709d63b1ef85b 100644 | 
| --- a/talk/app/webrtc/mediastreaminterface.h | 
| +++ b/talk/app/webrtc/mediastreaminterface.h | 
| @@ -85,6 +85,8 @@ class MediaSourceInterface : public rtc::RefCountInterface, | 
|  | 
| virtual SourceState state() const = 0; | 
|  | 
| +  virtual bool remote() const = 0; | 
| + | 
| protected: | 
| virtual ~MediaSourceInterface() {} | 
| }; | 
| @@ -152,6 +154,19 @@ class VideoTrackInterface : public MediaStreamTrackInterface { | 
| virtual ~VideoTrackInterface() {} | 
| }; | 
|  | 
| +// Interface for receiving audio data from a AudioTrack. | 
| +class AudioTrackSinkInterface { | 
| + public: | 
| +  virtual void OnData(const void* audio_data, | 
| +                      int bits_per_sample, | 
| +                      int sample_rate, | 
| +                      int number_of_channels, | 
| +                      size_t number_of_frames) = 0; | 
| + | 
| + protected: | 
| +  virtual ~AudioTrackSinkInterface() {} | 
| +}; | 
| + | 
| // AudioSourceInterface is a reference counted source used for AudioTracks. | 
| // The same source can be used in multiple AudioTracks. | 
| class AudioSourceInterface : public MediaSourceInterface { | 
| @@ -174,18 +189,10 @@ class AudioSourceInterface : public MediaSourceInterface { | 
| // Registers/unregisters observer to the audio source. | 
| virtual void RegisterAudioObserver(AudioObserver* observer) {} | 
| virtual void UnregisterAudioObserver(AudioObserver* observer) {} | 
| -}; | 
|  | 
| -// Interface for receiving audio data from a AudioTrack. | 
| -class AudioTrackSinkInterface { | 
| - public: | 
| -  virtual void OnData(const void* audio_data, | 
| -                      int bits_per_sample, | 
| -                      int sample_rate, | 
| -                      int number_of_channels, | 
| -                      size_t number_of_frames) = 0; | 
| - protected: | 
| -  virtual ~AudioTrackSinkInterface() {} | 
| +  // TODO(tommi): Make pure virtual. | 
| +  virtual void AddSink(AudioTrackSinkInterface* sink) {} | 
| +  virtual void RemoveSink(AudioTrackSinkInterface* sink) {} | 
| }; | 
|  | 
| // Interface of the audio processor used by the audio track to collect | 
|  |