| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2014 Google Inc. | 3 * Copyright 2014 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #ifndef TALK_APP_WEBRTC_REMOTEAUDIOSOURCE_H_ | 28 #ifndef TALK_APP_WEBRTC_REMOTEAUDIOSOURCE_H_ |
| 29 #define TALK_APP_WEBRTC_REMOTEAUDIOSOURCE_H_ | 29 #define TALK_APP_WEBRTC_REMOTEAUDIOSOURCE_H_ |
| 30 | 30 |
| 31 #include <list> | 31 #include <list> |
| 32 #include <string> | 32 #include <string> |
| 33 | 33 |
| 34 #include "talk/app/webrtc/mediastreaminterface.h" | 34 #include "talk/app/webrtc/mediastreaminterface.h" |
| 35 #include "talk/app/webrtc/notifier.h" | 35 #include "talk/app/webrtc/notifier.h" |
| 36 #include "talk/media/base/audiorenderer.h" | |
| 37 #include "webrtc/audio/audio_sink.h" | 36 #include "webrtc/audio/audio_sink.h" |
| 38 #include "webrtc/base/criticalsection.h" | 37 #include "webrtc/base/criticalsection.h" |
| 38 #include "webrtc/media/base/audiorenderer.h" |
| 39 | 39 |
| 40 namespace rtc { | 40 namespace rtc { |
| 41 struct Message; | 41 struct Message; |
| 42 class Thread; | 42 class Thread; |
| 43 } // namespace rtc | 43 } // namespace rtc |
| 44 | 44 |
| 45 namespace webrtc { | 45 namespace webrtc { |
| 46 | 46 |
| 47 class AudioProviderInterface; | 47 class AudioProviderInterface; |
| 48 | 48 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 AudioObserverList audio_observers_; | 87 AudioObserverList audio_observers_; |
| 88 rtc::CriticalSection sink_lock_; | 88 rtc::CriticalSection sink_lock_; |
| 89 std::list<AudioTrackSinkInterface*> sinks_; | 89 std::list<AudioTrackSinkInterface*> sinks_; |
| 90 rtc::Thread* const main_thread_; | 90 rtc::Thread* const main_thread_; |
| 91 SourceState state_; | 91 SourceState state_; |
| 92 }; | 92 }; |
| 93 | 93 |
| 94 } // namespace webrtc | 94 } // namespace webrtc |
| 95 | 95 |
| 96 #endif // TALK_APP_WEBRTC_REMOTEAUDIOSOURCE_H_ | 96 #endif // TALK_APP_WEBRTC_REMOTEAUDIOSOURCE_H_ |
| OLD | NEW |