Refs #10311. Port UPNP code from RefCounted to ReferenceCounter.

MythTV · Jun 1, 2012 · 671017f · 671017f
1 parent ca9086d
commit 671017f
Show file tree

Hide file tree

Showing 13 changed files with 95 additions and 171 deletions.
diff --git a/mythtv/libs/libmyth/backendselect.cpp b/mythtv/libs/libmyth/backendselect.cpp
@@ -28,10 +28,8 @@ BackendSelection::~BackendSelection()
     ItemMap::iterator it;
     for (it = m_devices.begin(); it != m_devices.end(); ++it)
     {
-        DeviceLocation *dev = *it;
-
-        if (dev)
-            dev->Release();
+        if (*it)
+            (*it)->DecrRef();
     }
 
     m_devices.clear();
@@ -132,7 +130,7 @@ void BackendSelection::AddItem(DeviceLocation *dev)
     // The devices' USN should be unique. Don't add if it is already there:
     if (m_devices.find(USN) == m_devices.end())
     {
-        dev->AddRef();
+        dev->IncrRef();
         m_devices.insert(USN, dev);
 
         m_mutex.unlock();
@@ -167,8 +165,6 @@ void BackendSelection::AddItem(DeviceLocation *dev)
     }
     else
         m_mutex.unlock();
-
-    dev->Release();
 }
 
 /**
@@ -246,11 +242,14 @@ void BackendSelection::Init(void)
     {
         EntryMap ourMap;
         pEntries->GetEntryMap(ourMap);
-        pEntries->Release();
+        pEntries->DecrRef();
 
         EntryMap::const_iterator it;
         for (it = ourMap.begin(); it != ourMap.end(); ++it)
-            AddItem(*it);   // this does an (*it)->Release()
+        {
+            AddItem(*it);
+            (*it)->DecrRef();
+        }
     }
 }
 
@@ -267,11 +266,8 @@ void BackendSelection::RemoveItem(QString USN)
 
     if (it != m_devices.end())
     {
-        DeviceLocation *dev = *it;
-
-        if (dev)
-            dev->Release();
-
+        if (*it)
+            (*it)->DecrRef();
         m_devices.erase(it);
     }
 
@@ -312,7 +308,10 @@ void BackendSelection::customEvent(QEvent *event)
         {
             DeviceLocation *devLoc = SSDP::Instance()->Find(URI, URN);
             if (devLoc)
-                AddItem(devLoc);   // this does a Release()
+            {
+                AddItem(devLoc);
+                devLoc->DecrRef();
+            }
         }
         else if (message.startsWith("SSDP_REMOVE"))
         {

diff --git a/mythtv/libs/libmyth/mythcontext.cpp b/mythtv/libs/libmyth/mythcontext.cpp
@@ -835,19 +835,20 @@ int MythContextPrivate::UPnPautoconf(const int milliSeconds)
 
     if (count != 1)
     {
-        backends->Release();
+        backends->DecrRef();
         return count;
     }
 
     // Get this backend's location:
     DeviceLocation *BE = backends->GetFirst();
-    backends->Release();
+    backends->DecrRef();
+    backends = NULL;
 
     // We don't actually know the backend's access PIN, so this will
     // only work for ones that have PIN access disabled (i.e. 0000)
     int ret = (UPnPconnect(BE, QString::null)) ? 1 : -1;
 
-    BE->Release();
+    BE->DecrRef();
 
     return ret;
 }
@@ -915,12 +916,11 @@ bool MythContextPrivate::DefaultUPnP(QString &error)
 
     if (UPnPconnect(pDevLoc, PIN))
     {
-        pDevLoc->Release();
-
+        pDevLoc->DecrRef();
         return true;
     }
 
-    pDevLoc->Release();
+    pDevLoc->DecrRef();
 
     error = "Cannot connect to default backend via UPnP. Wrong saved PIN?";
     return false;

diff --git a/mythtv/libs/libmythupnp/eventing.cpp b/mythtv/libs/libmythupnp/eventing.cpp
@@ -411,6 +411,8 @@ void Eventing::NotifySubscriber( SubscriberInfo *pInfo )
 
         TaskQueue::Instance()->AddTask( 250, pEventTask );
 
+        pEventTask->DecrRef();
+
         // ------------------------------------------------------------------
         // Update the subscribers Key & last Notified fields
         // ------------------------------------------------------------------

diff --git a/mythtv/libs/libmythupnp/httpserver.h b/mythtv/libs/libmythupnp/httpserver.h
@@ -33,7 +33,6 @@
 #include "serverpool.h"
 #include "httprequest.h"
 #include "mthreadpool.h"
-#include "refcounted.h"
 #include "upnputil.h"
 #include "compat.h"
 

diff --git a/mythtv/libs/libmythupnp/refcounted.h b/mythtv/libs/libmythupnp/refcounted.h
diff --git a/mythtv/libs/libmythupnp/ssdp.cpp b/mythtv/libs/libmythupnp/ssdp.cpp
@@ -122,7 +122,10 @@ SSDP::~SSDP()
     wait();
 
     if (m_pNotifyTask != NULL)
-        m_pNotifyTask->Release();
+    {
+        m_pNotifyTask->DecrRef();
+        m_pNotifyTask = NULL;
+    }
 
     for (int nIdx = 0; nIdx < (int)NumberOfSockets; nIdx++ )
     {
@@ -154,12 +157,6 @@ void SSDP::EnableNotifications( int nServicePort )
             "SSDP::EnableNotifications() - creating new task");
         m_pNotifyTask = new UPnpNotifyTask( m_nServicePort ); 
 
-        // ------------------------------------------------------------------
-        // Let's make sure to hold on to a reference of the NotifyTask.
-        // ------------------------------------------------------------------
-
-        m_pNotifyTask->AddRef();
-
         // ------------------------------------------------------------------
         // First Send out Notification that we are leaving the network.
         // ------------------------------------------------------------------
@@ -505,6 +502,8 @@ bool SSDP::ProcessSearchRequest( const QStringMap &sHeaders,
 
         TaskQueue::Instance()->AddTask( nNewMX, pTask );
 
+        pTask->DecrRef();
+
         return true;
     }
 
@@ -529,6 +528,8 @@ bool SSDP::ProcessSearchRequest( const QStringMap &sHeaders,
 
         TaskQueue::Instance()->AddTask( nNewMX, pTask );
 
+        pTask->DecrRef();
+
         return true;
     }