[BTAudio] Use COM Dangling instead of Revoked (#935)

Author: sebaszm

BluetoothAudio/BluetoothAudio.h

@@ -36,25 +36,24 @@ namespace Plugin {
 
         class ComNotificationSink : public PluginHost::IShell::ICOMLink::INotification {
         public:
-            ComNotificationSink() = delete;
             ComNotificationSink(const ComNotificationSink&) = delete;
             ComNotificationSink& operator=(const ComNotificationSink&) = delete;
+            ComNotificationSink(ComNotificationSink&&) = delete;
+            ComNotificationSink& operator=(ComNotificationSink&&) = delete;
+
+            ComNotificationSink() = delete;
+
             ComNotificationSink(BluetoothAudio& parent)
                 : _parent(parent)
             {
             }
+
             ~ComNotificationSink() = default;
 
         public:
             void Dangling(const Core::IUnknown* remote, const uint32_t interfaceId) override
             {
-                Revoked(remote, interfaceId);
-            }
-            void Revoked(const Core::IUnknown* remote, const uint32_t interfaceId) override
-            {
-                ASSERT(remote != nullptr);
-
-                _parent.Revoked(remote, interfaceId);
+                _parent.Dangling(remote, interfaceId);
             }
 
         public:
@@ -101,14 +100,16 @@ namespace Plugin {
         }
 
     private:
-        void Revoked(const Core::IUnknown* remote, const uint32_t interfaceId)
+        void Dangling(const Core::IUnknown* remote, const uint32_t interfaceId)
         {
+            ASSERT(remote != nullptr);
+
             if (_sink != nullptr) {
-                _sink->Revoked(remote, interfaceId);
+                _sink->OnDangling(remote, interfaceId);
             }
 
             if (_source != nullptr) {
-                _source->Revoked(remote, interfaceId);
+                _source->OnDangling(remote, interfaceId);
             }
         }
 

BluetoothAudio/BluetoothAudioSink.h

@@ -1900,13 +1900,15 @@ namespace Plugin {
         }
 
     public:
-        void Revoked(const Core::IUnknown* remote, const uint32_t interfaceId VARIABLE_IS_NOT_USED)
+        void OnDangling(const Core::IUnknown* remote, const uint32_t interfaceId VARIABLE_IS_NOT_USED)
         {
             // The COM-RPC link has been disconnected abruptly, clean up!
 
             if (remote == _callback) {
                 TRACE(SinkFlow, (_T("Bluetooth audio sink remote client died; cleaning up the playback session on behalf of the dead")));
 
+                ASSERT(interfaceId == Exchange::IBluetoothAudio::ISink::ICallback::ID);
+
                 Callback(nullptr);
                 Source(nullptr);
 

BluetoothAudio/BluetoothAudioSource.h

@@ -1195,11 +1195,13 @@ namespace Plugin {
         }
 
     public:
-        void Revoked(const Core::IUnknown* remote, const uint32_t interfaceId VARIABLE_IS_NOT_USED)
+        void OnDangling(const Core::IUnknown* remote, const uint32_t interfaceId VARIABLE_IS_NOT_USED)
         {
             if (remote == _callback) {
                 TRACE(Trace::Information, (_T("Remote client died; cleaning up callbaks on behalf of the dead")));
 
+                ASSERT(interfaceId == Exchange::IBluetoothAudio::ISource::ICallback::ID);
+
                 Callback(nullptr);
 
                 _cleanupJob.Submit([this]() {