Bug 1366707 - update callers of cubeb_device_collection_destroy. r?kinetik draft
authorAlex Chronopoulos <achronop@gmail.com>
Tue, 23 May 2017 11:30:05 +0300
changeset 582859 49a2197f60f71faf4c932a342e73740f33a6dd11
parent 582858 4e3fd1b4d82b3de5df613b2ea51b66bb07cb415d
child 629890 37f0f91a5e98dc2b47afd25d235f7ea5fbd2cbcd
push id60214
push userachronop@gmail.com
push dateTue, 23 May 2017 08:31:51 +0000
reviewerskinetik
bugs1366707
milestone55.0a1
Bug 1366707 - update callers of cubeb_device_collection_destroy. r?kinetik MozReview-Commit-ID: JByi6XfgWh2
dom/media/webrtc/MediaEngineWebRTC.cpp
dom/media/webrtc/MediaEngineWebRTC.h
--- a/dom/media/webrtc/MediaEngineWebRTC.cpp
+++ b/dom/media/webrtc/MediaEngineWebRTC.cpp
@@ -97,17 +97,17 @@ void AudioInputCubeb::UpdateDeviceList()
         mDefaultDevice = j;
       }
     }
   }
   LOG(("Cubeb default input device %d", mDefaultDevice));
   StaticMutexAutoLock lock(sMutex);
   // swap state
   if (mDevices) {
-    cubeb_device_collection_destroy(mDevices);
+    cubeb_device_collection_destroy(cubebContext, mDevices);
   }
   mDevices = devices;
 }
 
 MediaEngineWebRTC::MediaEngineWebRTC(MediaEnginePrefs &aPrefs)
   : mMutex("mozilla::MediaEngineWebRTC"),
     mVoiceEngine(nullptr),
     mAudioInput(nullptr),
--- a/dom/media/webrtc/MediaEngineWebRTC.h
+++ b/dom/media/webrtc/MediaEngineWebRTC.h
@@ -176,17 +176,17 @@ public:
       mDefaultDevice = -1;
     }
   }
 
   static void CleanupGlobalData()
   {
     if (mDevices) {
       // This doesn't require anything more than support for free()
-      cubeb_device_collection_destroy(mDevices);
+      cubeb_device_collection_destroy(CubebUtils::GetCubebContext(), mDevices);
       mDevices = nullptr;
     }
     delete mDeviceIndexes;
     mDeviceIndexes = nullptr;
     delete mDeviceNames;
     mDeviceNames = nullptr;
   }