commit 82ed988a1c39965050ab938316919023e980b664
author Fredrik Solenberg <solenberg@webrtc.org> Mon Nov 20 11:52:21 2017
committer Commit Bot <commit-bot@chromium.org> Mon Nov 20 13:37:00 2017
tree 0cf8caaef7dc5bb5fa05f7ec7c63b39f165baf8c
parent c6a003c192d0090b272e238863335876db844edb

Allow multiple Init() calls on FakeAudioDevice

This is temporarily needed while landing https://webrtc-review.googlesource.com/c/src/+/23820 and updating clients.

Bug: webrtc:4690
Change-Id: Ib0bd6a6a063a8a54c80b73853b2c042dfb02c44a
Reviewed-on: https://webrtc-review.googlesource.com/24501
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20791}

test/fake_audio_device.cc

diff --git a/test/fake_audio_device.cc b/test/fake_audio_device.cc
index eef8bfd..fa3f1f4 100644
--- a/test/fake_audio_device.cc
+++ b/test/fake_audio_device.cc
@@ -303,9 +303,13 @@
 }
 
 int32_t FakeAudioDevice::Init() {
-  RTC_CHECK(tick_->StartTimer(true, kFrameLengthMs / speed_));
-  thread_.Start();
-  thread_.SetPriority(rtc::kHighPriority);
+  // TODO(solenberg): Temporarily allow multiple init calls.
+  if (!inited_) {
+    RTC_CHECK(tick_->StartTimer(true, kFrameLengthMs / speed_));
+    thread_.Start();
+    thread_.SetPriority(rtc::kHighPriority);
+    inited_ = true;
+  }
   return 0;
 }
 

test/fake_audio_device.h

diff --git a/test/fake_audio_device.h b/test/fake_audio_device.h
index f71fd01..4d90619 100644
--- a/test/fake_audio_device.h
+++ b/test/fake_audio_device.h
@@ -137,6 +137,7 @@
 
   std::unique_ptr<EventTimerWrapper> tick_;
   rtc::PlatformThread thread_;
+  bool inited_ = false;
 };
 }  // namespace test
 }  // namespace webrtc