UPNP: Connect to MythPower and send SSDP notifications appropriately

- which should ensure we play nicely with other devices when suspending
etc

mythtv/libs/libmythupnp/upnp.cpp

@@ -40,8 +40,20 @@ Configuration   *UPnp::g_pConfig        = nullptr;
 //////////////////////////////////////////////////////////////////////////////
 
 UPnp::UPnp()
+  : QObject()
 {
     LOG(VB_UPNP, LOG_DEBUG, "UPnp - Constructor");
+    // N.B. Ask for 5 second delay to send Bye Bye twice
+    // TODO Check whether we actually send Bye Bye twice:)
+    m_power = MythPower::AcquireRelease(this, true, 5);
+    if (m_power)
+    {
+        // NB We only listen for WillXXX signals which should give us time to send notifications
+        connect(m_power, &MythPower::WillRestart,  this, &UPnp::DisableNotifications);
+        connect(m_power, &MythPower::WillSuspend,  this, &UPnp::DisableNotifications);
+        connect(m_power, &MythPower::WillShutDown, this, &UPnp::DisableNotifications);
+        connect(m_power, &MythPower::WokeUp,       this, &UPnp::EnableNotificatins);
+    }
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -52,6 +64,8 @@ UPnp::~UPnp()
 {
     LOG(VB_UPNP, LOG_DEBUG, "UPnp - Destructor");
     CleanUp();
+    if (m_power)
+        MythPower::AcquireRelease(this, false);
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -319,3 +333,13 @@ void UPnp::FormatRedirectResponse( HTTPRequest   *pRequest,
 
     pRequest->SendResponse();
 }
+
+void UPnp::DisableNotifications(uint)
+{
+    SSDP::Instance()->DisableNotifications();
+}
+
+void UPnp::EnableNotificatins(qint64)
+{
+    SSDP::Instance()->EnableNotifications(m_nServicePort);
+}

mythtv/libs/libmythupnp/upnp.h

@@ -13,7 +13,12 @@
 #ifndef __UPNP_H__
 #define __UPNP_H__
 
+// Qt
+#include <QObject>
+
+// MythTV
 #include "configuration.h"
+#include "mythpower.h"
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -91,8 +96,9 @@ enum UPnPResultCode
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
-class UPNP_PUBLIC UPnp
+class UPNP_PUBLIC UPnp : public QObject
 {
+    Q_OBJECT
 
     protected:
 
@@ -137,7 +143,12 @@ class UPNP_PUBLIC UPnp
         static void            FormatRedirectResponse( HTTPRequest   *pRequest,
                                                        const QString &hostName );
 
+    public slots:
+        void DisableNotifications(uint);
+        void EnableNotificatins(qint64);
 
+    private:
+        MythPower* m_power;
 };
 
 #endif