OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2015 Google Inc. | 3 * Copyright 2015 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 call_.reset(webrtc::Call::Create(config)); | 67 call_.reset(webrtc::Call::Create(config)); |
68 } | 68 } |
69 void Destruct_w() { | 69 void Destruct_w() { |
70 DCHECK(worker_thread_->IsCurrent()); | 70 DCHECK(worker_thread_->IsCurrent()); |
71 call_.reset(nullptr); | 71 call_.reset(nullptr); |
72 } | 72 } |
73 | 73 |
74 rtc::Thread* worker_thread_; | 74 rtc::Thread* worker_thread_; |
75 rtc::scoped_ptr<webrtc::Call> call_; | 75 rtc::scoped_ptr<webrtc::Call> call_; |
76 | 76 |
77 DISALLOW_IMPLICIT_CONSTRUCTORS(MediaController); | 77 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MediaController); |
78 }; | 78 }; |
79 } // namespace { | 79 } // namespace { |
80 | 80 |
81 namespace webrtc { | 81 namespace webrtc { |
82 | 82 |
83 MediaControllerInterface* MediaControllerInterface::Create( | 83 MediaControllerInterface* MediaControllerInterface::Create( |
84 rtc::Thread* worker_thread, webrtc::VoiceEngine* voice_engine) { | 84 rtc::Thread* worker_thread, webrtc::VoiceEngine* voice_engine) { |
85 return new MediaController(worker_thread, voice_engine); | 85 return new MediaController(worker_thread, voice_engine); |
86 } | 86 } |
87 } // namespace webrtc | 87 } // namespace webrtc |
OLD | NEW |