Issue %3014 - Part 1: Remove conditional WebRTC code

1 files changed, 2 insertions, 22 deletions

diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp
index 70b59c61f..eacc7686f 100644
--- a/dom/media/GraphDriver.cpp
+++ b/dom/media/GraphDriver.cpp
@@ -10,10 +10,6 @@
 #include "mozilla/Unused.h"
 #include "CubebUtils.h"
 
-#ifdef MOZ_WEBRTC
-#include "webrtc/MediaEngineWebRTC.h"
-#endif
-
 extern mozilla::LazyLogModule gMediaStreamGraphLog;
 #define STREAM_LOG(type, msg) MOZ_LOG(gMediaStreamGraphLog, type, msg)
 
@@ -618,21 +614,8 @@ AudioCallbackDriver::Init()
   // We have to translate the deviceID values to cubeb devid's since those can be
   // freed whenever enumerate is called.
   {
-#ifdef MOZ_WEBRTC
-    StaticMutexAutoLock lock(AudioInputCubeb::Mutex());
-#endif
-    if ((!mGraphImpl->mInputWanted
-#ifdef MOZ_WEBRTC
-         || AudioInputCubeb::GetDeviceID(mGraphImpl->mInputDeviceID, input_id)
-#endif
-         ) &&
-        (mGraphImpl->mOutputDeviceID == -1 // pass nullptr for ID for default output
-#ifdef MOZ_WEBRTC
-         // XXX we should figure out how we would use a deviceID for output without webrtc.
-         // Currently we don't set this though, so it's ok
-         || AudioInputCubeb::GetDeviceID(mGraphImpl->mOutputDeviceID, output_id)
-#endif
-         ) &&
+    if ((!mGraphImpl->mInputWanted) &&
+        (mGraphImpl->mOutputDeviceID == -1) && // pass nullptr for ID for default output
         // XXX Only pass input input if we have an input listener.  Always
         // set up output because it's easier, and it will just get silence.
         // XXX Add support for adding/removing an input listener later.
@@ -649,9 +632,6 @@ AudioCallbackDriver::Init()
         rv == CUBEB_OK,
         "Could not set the audio stream volume in GraphDriver.cpp");
     } else {
-#ifdef MOZ_WEBRTC
-      StaticMutexAutoUnlock unlock(AudioInputCubeb::Mutex());
-#endif
       NS_WARNING("Could not create a cubeb stream for MediaStreamGraph, falling back to a SystemClockDriver");
       // Fall back to a driver using a normal thread. If needed,
       // the graph will try to re-open an audio stream later.